diff options
| author | Bernhard Beschow <shentey@gmail.com> | 2018-12-11 17:33:18 +0100 |
|---|---|---|
| committer | Bernhard Beschow <shentey@gmail.com> | 2019-01-06 21:50:08 +0000 |
| commit | 9ee785a4efc0ddbf1edf705de690955a97e0a34b (patch) | |
| tree | 319addea5e7e5ca4fd7bf68ab3060617fa9772cd /src/plugins/cpptools/cppmodelmanager_test.cpp | |
| parent | 5916be8756e03fbd1c7d1553500028a100bcf572 (diff) | |
CppModelManager: Remove method overload used only in tests
Use (and therefore test) the method actually used in production code.
Change-Id: I4317517ef8a1779df4d46af3905790012ee98645
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/cpptools/cppmodelmanager_test.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppmodelmanager_test.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
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<void> 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<void> 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<void> dummy; + mm->updateProjectInfo(dummy, pi); CPlusPlus::Snapshot snapshot; QSet<QString> refreshedFiles; @@ -384,7 +387,8 @@ void CppToolsPlugin::test_modelmanager_refresh_test_for_changes() // Reindexing triggers a reparsing thread helper.resetRefreshedSourceFiles(); - QFuture<void> firstFuture = mm->updateProjectInfo(pi); + QFutureInterface<void> dummy; + QFuture<void> firstFuture = mm->updateProjectInfo(dummy, pi); QVERIFY(firstFuture.isStarted() || firstFuture.isRunning()); firstFuture.waitForFinished(); const QSet<QString> 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<void> subsequentFuture = mm->updateProjectInfo(pi); + QFuture<void> subsequentFuture = mm->updateProjectInfo(dummy, pi); QVERIFY(subsequentFuture.isCanceled() && subsequentFuture.isFinished()); } |