diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2021-08-19 17:46:33 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2021-08-23 09:59:06 +0000 |
commit | 49d8f1ad374dd5ef48a1ddc3e62989f0013e0a82 (patch) | |
tree | 761b0a1267a8a0700907d8c417408c67e5db2b1c /src/plugins/cpptools | |
parent | 0d7f357294c89fd71d7404350c736f008bb36b8d (diff) |
CppTools: Remove unused additional indexing support object
Its presence is confusing.
Change-Id: I61986e970e0f58cded5b97dae2cd28abcdb3ecff
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/cpptools')
-rw-r--r-- | src/plugins/cpptools/cppmodelmanager.cpp | 16 | ||||
-rw-r--r-- | src/plugins/cpptools/cppmodelmanager.h | 1 | ||||
-rw-r--r-- | src/plugins/cpptools/symbolsearcher_test.cpp | 23 |
3 files changed, 2 insertions, 38 deletions
diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index 54d7db6faa..53123e52f0 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -173,7 +173,6 @@ public: ModelManagerSupport::Ptr m_activeModelManagerSupport; // Indexing - CppIndexingSupport *m_indexingSupporter; CppIndexingSupport *m_internalIndexingSupport; bool m_indexerEnabled; @@ -644,7 +643,6 @@ CppModelManager::CppModelManager() setObjectName("CppModelManager"); ExtensionSystem::PluginManager::addObject(this); - d->m_indexingSupporter = nullptr; d->m_enableGC = true; // Visual C++ has 1MiB, macOSX has 512KiB @@ -968,8 +966,6 @@ QFuture<void> CppModelManager::updateSourceFiles(const QSet<QString> &sourceFile const QSet<QString> filteredFiles = tooBigFilesRemoved(sourceFiles, indexerFileSizeLimitInMb()); - if (d->m_indexingSupporter) - d->m_indexingSupporter->refreshSourceFiles(filteredFiles, mode); return d->m_internalIndexingSupport->refreshSourceFiles(filteredFiles, mode); } @@ -1652,19 +1648,9 @@ BaseEditorDocumentProcessor *CppModelManager::createEditorDocumentProcessor( return d->m_activeModelManagerSupport->createEditorDocumentProcessor(baseTextDocument); } -void CppModelManager::setIndexingSupport(CppIndexingSupport *indexingSupport) -{ - if (indexingSupport) { - if (dynamic_cast<BuiltinIndexingSupport *>(indexingSupport)) - d->m_indexingSupporter = nullptr; - else - d->m_indexingSupporter = indexingSupport; - } -} - CppIndexingSupport *CppModelManager::indexingSupport() { - return d->m_indexingSupporter ? d->m_indexingSupporter : d->m_internalIndexingSupport; + return d->m_internalIndexingSupport; } QStringList CppModelManager::projectFiles() diff --git a/src/plugins/cpptools/cppmodelmanager.h b/src/plugins/cpptools/cppmodelmanager.h index f2106fed66..aa3a88a301 100644 --- a/src/plugins/cpptools/cppmodelmanager.h +++ b/src/plugins/cpptools/cppmodelmanager.h @@ -192,7 +192,6 @@ public: FollowSymbolInterface &followSymbolInterface() const; std::unique_ptr<AbstractOverviewModel> createOverviewModel() const; - void setIndexingSupport(CppIndexingSupport *indexingSupport); CppIndexingSupport *indexingSupport(); QStringList projectFiles(); diff --git a/src/plugins/cpptools/symbolsearcher_test.cpp b/src/plugins/cpptools/symbolsearcher_test.cpp index 44e13d9984..4f501c32f6 100644 --- a/src/plugins/cpptools/symbolsearcher_test.cpp +++ b/src/plugins/cpptools/symbolsearcher_test.cpp @@ -86,19 +86,12 @@ public: class SymbolSearcherTestCase : public Tests::TestCase { public: - /// Takes no ownership of indexingSupportToUse SymbolSearcherTestCase(const QString &testFile, - CppIndexingSupport *indexingSupportToUse, const SymbolSearcher::Parameters &searchParameters, const ResultDataList &expectedResults) - : m_indexingSupportToUse(indexingSupportToUse) { QVERIFY(succeededSoFar()); - - QVERIFY(m_indexingSupportToUse); QVERIFY(parseFiles(testFile)); - m_indexingSupportToRestore = m_modelManager->indexingSupport(); - m_modelManager->setIndexingSupport(m_indexingSupportToUse); CppIndexingSupport *indexingSupport = m_modelManager->indexingSupport(); const QScopedPointer<SymbolSearcher> symbolSearcher( @@ -109,16 +102,6 @@ public: ResultDataList results = ResultData::fromSearchResultList(search.results()); QCOMPARE(results, expectedResults); } - - ~SymbolSearcherTestCase() - { - if (m_indexingSupportToRestore) - m_modelManager->setIndexingSupport(m_indexingSupportToRestore); - } - -private: - CppIndexingSupport *m_indexingSupportToRestore = nullptr; - CppIndexingSupport *m_indexingSupportToUse = nullptr; }; } // anonymous namespace @@ -143,11 +126,7 @@ void CppToolsPlugin::test_builtinsymbolsearcher() QFETCH(SymbolSearcher::Parameters, searchParameters); QFETCH(ResultDataList, expectedResults); - QScopedPointer<CppIndexingSupport> builtinIndexingSupport(new BuiltinIndexingSupport); - SymbolSearcherTestCase(testFile, - builtinIndexingSupport.data(), - searchParameters, - expectedResults); + SymbolSearcherTestCase(testFile, searchParameters, expectedResults); } void CppToolsPlugin::test_builtinsymbolsearcher_data() |