diff options
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager.cpp')
-rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 10fbbcf11e..4db2cbb1b9 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -39,7 +39,6 @@ #include "cpplocatordata.h" #include "cpplocatorfilter.h" #include "cppbuiltinmodelmanagersupport.h" -#include "cppqtstyleindenter.h" #include "cpprefactoringchanges.h" #include "cpprefactoringengine.h" #include "cppsourceprocessor.h" @@ -510,7 +509,6 @@ void CppModelManager::initializeBuiltinModelManagerSupport() CppModelManager::CppModelManager() : CppModelManagerBase(nullptr) - , createCppIndenter([]() { return new CppQtStyleIndenter; }) , d(new CppModelManagerPrivate) { d->m_indexingSupporter = 0; @@ -1031,12 +1029,6 @@ void CppModelManager::updateCppEditorDocuments(bool projectsUpdated) const } } -QFuture<void> CppModelManager::updateProjectInfo(const ProjectInfo &newProjectInfo) -{ - QFutureInterface<void> dummy; - return updateProjectInfo(dummy, newProjectInfo); -} - QFuture<void> CppModelManager::updateProjectInfo(QFutureInterface<void> &futureInterface, const ProjectInfo &newProjectInfo) { @@ -1170,9 +1162,9 @@ ProjectPart::Ptr CppModelManager::fallbackProjectPart() // Do not activate ObjectiveCExtensions since this will lead to the // "objective-c++" language option for a project-less *.cpp file. - part->languageExtensions = ProjectExplorer::LanguageExtension::All; - part->languageExtensions &= ~ProjectExplorer::LanguageExtensions( - ProjectExplorer::LanguageExtension::ObjectiveC); + part->languageExtensions = Utils::LanguageExtension::All; + part->languageExtensions &= ~Utils::LanguageExtensions( + Utils::LanguageExtension::ObjectiveC); part->qtVersion = ProjectPart::Qt5; part->updateLanguageFeatures(); @@ -1326,11 +1318,6 @@ void CppModelManager::renameIncludes(const QString &oldFileName, const QString & } } -void CppModelManager::setBackendJobsPostponed(bool postponed) -{ - d->m_activeModelManagerSupport->setBackendJobsPostponed(postponed); -} - void CppModelManager::onCoreAboutToClose() { Core::ProgressManager::cancelTasks(CppTools::Constants::TASK_INDEX); |