diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-02 18:42:05 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-02 18:42:05 +0100 |
| commit | 100ea30a1a5ccb0af4adafbf08b8fa89fe3c0ee7 (patch) | |
| tree | 0b2aca7b1533ac466e7d2312a6bd3fa1a0282ea1 /src/plugins/cpptools/cppmodelmanager.h | |
| parent | f86ebcbf22d7df6be60f1fc5c9f0f30a76e104d6 (diff) | |
| parent | e4be9edc4d538465338b8981294aa414a43b7255 (diff) | |
| download | qt-creator-100ea30a1a5ccb0af4adafbf08b8fa89fe3c0ee7.tar.gz | |
Merge remote-tracking branch 'origin/3.6'
Conflicts:
src/plugins/projectexplorer/toolchainmanager.cpp
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
Change-Id: Id736c6922670c921c689219cb817b1541eaaf304
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.h')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h index dac3973bce..4c10343eda 100644 --- a/src/plugins/cpptools/cppmodelmanager.h +++ b/src/plugins/cpptools/cppmodelmanager.h @@ -91,6 +91,7 @@ public: QFuture<void> updateSourceFiles(const QSet<QString> &sourceFiles, ProgressNotificationMode mode = ReservedProgressNotification); + void updateCppEditorDocuments() const; WorkingCopy workingCopy() const; QByteArray codeModelConfiguration() const; @@ -120,7 +121,7 @@ public: const QByteArray &contents); void emitAbstractEditorSupportRemoved(const QString &filePath); - bool isCppEditor(Core::IEditor *editor) const; + static bool isCppEditor(Core::IEditor *editor); bool isClangCodeModelAvailable() const; bool isClangCodeModelActive() const; @@ -209,7 +210,6 @@ private: void initializeModelManagerSupports(); void delayedGC(); void recalculateProjectPartMappings(); - void updateCppEditorDocuments() const; void replaceSnapshot(const CPlusPlus::Snapshot &newSnapshot); void removeFilesFromSnapshot(const QSet<QString> &removedFiles); |