diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 514b2d62230..e5185174b10 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -1029,12 +1029,6 @@ void CppModelManager::updateCppEditorDocuments(bool projectsUpdated) const } } -QFuture CppModelManager::updateProjectInfo(const ProjectInfo &newProjectInfo) -{ - QFutureInterface dummy; - return updateProjectInfo(dummy, newProjectInfo); -} - QFuture CppModelManager::updateProjectInfo(QFutureInterface &futureInterface, const ProjectInfo &newProjectInfo) { diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h index 9fcd7169e7e..e273a128c6f 100644 --- a/src/plugins/cpptools/cppmodelmanager.h +++ b/src/plugins/cpptools/cppmodelmanager.h @@ -116,7 +116,6 @@ public: QList projectInfos() const; ProjectInfo projectInfo(ProjectExplorer::Project *project) const; - QFuture updateProjectInfo(const ProjectInfo &newProjectInfo); QFuture updateProjectInfo(QFutureInterface &futureInterface, const ProjectInfo &newProjectInfo); diff --git a/src/plugins/cpptools/cppmodelmanager_test.cpp b/src/plugins/cpptools/cppmodelmanager_test.cpp index baeb8928b2e..e3d40ecc5f7 100644 --- a/src/plugins/cpptools/cppmodelmanager_test.cpp +++ b/src/plugins/cpptools/cppmodelmanager_test.cpp @@ -190,7 +190,8 @@ void CppToolsPlugin::test_modelmanager_paths_are_clean() {testDataDir.frameworksDir(false), HeaderPathType::Framework}}; pi.appendProjectPart(part); - mm->updateProjectInfo(pi); + QFutureInterface dummy; + mm->updateProjectInfo(dummy, pi); ProjectExplorer::HeaderPaths headerPaths = mm->headerPaths(); QCOMPARE(headerPaths.size(), 2); @@ -222,7 +223,8 @@ void CppToolsPlugin::test_modelmanager_framework_headers() part->files << ProjectFile(source, ProjectFile::CXXSource); pi.appendProjectPart(part); - mm->updateProjectInfo(pi).waitForFinished(); + QFutureInterface dummy; + mm->updateProjectInfo(dummy, pi).waitForFinished(); QCoreApplication::processEvents(); QVERIFY(mm->snapshot().contains(source)); @@ -321,7 +323,8 @@ void CppToolsPlugin::test_modelmanager_refresh_several_times() part->files.append(ProjectFile(testHeader2, ProjectFile::CXXHeader)); part->files.append(ProjectFile(testCpp, ProjectFile::CXXSource)); pi.appendProjectPart(part); - mm->updateProjectInfo(pi); + QFutureInterface dummy; + mm->updateProjectInfo(dummy, pi); CPlusPlus::Snapshot snapshot; QSet refreshedFiles; @@ -384,7 +387,8 @@ void CppToolsPlugin::test_modelmanager_refresh_test_for_changes() // Reindexing triggers a reparsing thread helper.resetRefreshedSourceFiles(); - QFuture firstFuture = mm->updateProjectInfo(pi); + QFutureInterface dummy; + QFuture firstFuture = mm->updateProjectInfo(dummy, pi); QVERIFY(firstFuture.isStarted() || firstFuture.isRunning()); firstFuture.waitForFinished(); const QSet refreshedFiles = helper.waitForRefreshedSourceFiles(); @@ -392,7 +396,7 @@ void CppToolsPlugin::test_modelmanager_refresh_test_for_changes() QVERIFY(refreshedFiles.contains(testCpp)); // No reindexing since nothing has changed - QFuture subsequentFuture = mm->updateProjectInfo(pi); + QFuture subsequentFuture = mm->updateProjectInfo(dummy, pi); QVERIFY(subsequentFuture.isCanceled() && subsequentFuture.isFinished()); } diff --git a/src/plugins/cpptools/modelmanagertesthelper.cpp b/src/plugins/cpptools/modelmanagertesthelper.cpp index c21760f1b25..0df295ba95b 100644 --- a/src/plugins/cpptools/modelmanagertesthelper.cpp +++ b/src/plugins/cpptools/modelmanagertesthelper.cpp @@ -93,7 +93,8 @@ ModelManagerTestHelper::Project *ModelManagerTestHelper::createProject(const QSt QSet ModelManagerTestHelper::updateProjectInfo(const CppTools::ProjectInfo &projectInfo) { resetRefreshedSourceFiles(); - CppModelManager::instance()->updateProjectInfo(projectInfo).waitForFinished(); + QFutureInterface dummy; + CppModelManager::instance()->updateProjectInfo(dummy, projectInfo).waitForFinished(); QCoreApplication::processEvents(); return waitForRefreshedSourceFiles(); }