aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
diff options
context:
space:
mode:
authorNikolai Kosjar <nikolai.kosjar@qt.io>2018-09-25 09:41:32 +0200
committerNikolai Kosjar <nikolai.kosjar@qt.io>2018-09-26 10:45:41 +0000
commitaa290912b832da3d4fd57e762902d3c24614d1a6 (patch)
tree52e211dc06503c386ad19e8bf4b038c8b5a8323b /src/plugins/clangcodemodel/clangeditordocumentprocessor.h
parent25ea9a4d2465a1ca7d1375f8937fd36d247f41e4 (diff)
Clang: Remove project tracking on clangbackend side
...as it is not needed. Just provide the compilation arguments as part of the Document. As a side effect, re-initializing the backend after a crash is cheaper and will not freeze the UI anymore (referenced bug). Task-number: QTCREATORBUG-21097 Change-Id: I866e25ef1fd5e4d318df16612a7564469e6baa11 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Diffstat (limited to 'src/plugins/clangcodemodel/clangeditordocumentprocessor.h')
-rw-r--r--src/plugins/clangcodemodel/clangeditordocumentprocessor.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
index e8aa9003ed..9229a60132 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.h
@@ -118,14 +118,14 @@ private:
void updateBackendProjectPartAndDocument();
void updateBackendDocument(CppTools::ProjectPart &projectPart);
void updateBackendDocumentIfProjectPartExists();
- void requestAnnotationsFromBackend(const QString &projectpartId);
+ void requestAnnotationsFromBackend();
HeaderErrorDiagnosticWidgetCreator creatorForHeaderErrorDiagnosticWidget(
const ClangBackEnd::DiagnosticContainer &firstHeaderErrorDiagnostic);
ClangBackEnd::FileContainer simpleFileContainer(const QByteArray &codecName = QByteArray()) const;
ClangBackEnd::FileContainer fileContainerWithOptionsAndDocumentContent(
- CppTools::ProjectPart &projectPart, const QStringList &fileOptions) const;
- ClangBackEnd::FileContainer fileContainerWithDocumentContent(const QString &projectpartId) const;
+ const QStringList &compilationArguments) const;
+ ClangBackEnd::FileContainer fileContainerWithDocumentContent() const;
private:
TextEditor::TextDocument &m_document;