feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppIndexingSupport: Get rid of createSymbolSearcher()

Browse Source 
Create SymbolSearcher directly instead.

Change-Id: I48b054654038a8f3033e858324666c649295e2d4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2023-01-02 13:50:29 +01:00
parent c3e0c387f5
commit fb477d6567
4 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cppeditor/cppindexingsupport.cpp
View File

@@ -334,10 +334,4 @@ QFuture<void> CppIndexingSupport::refreshSourceFiles(const QSet<QString> &source
return result; return result;
} }
SymbolSearcher *CppIndexingSupport::createSymbolSearcher(
const SymbolSearcher::Parameters &parameters, const QSet<QString> &fileNames)
{
return new SymbolSearcher(parameters, fileNames);
}
} // namespace CppEditor } // namespace CppEditor

2
src/plugins/cppeditor/cppindexingsupport.h
View File

@@ -62,8 +62,6 @@ public:
QFuture<void> refreshSourceFiles(const QSet<QString> &sourceFiles, QFuture<void> refreshSourceFiles(const QSet<QString> &sourceFiles,
CppModelManager::ProgressNotificationMode mode); CppModelManager::ProgressNotificationMode mode);
SymbolSearcher *createSymbolSearcher(const SymbolSearcher::Parameters &parameters,
const QSet<QString> &fileNames);
private: private:
Utils::FutureSynchronizer m_synchronizer; Utils::FutureSynchronizer m_synchronizer;
}; };

3
src/plugins/cppeditor/symbolsearcher_test.cpp
View File

@@ -75,9 +75,8 @@ public:
QVERIFY(succeededSoFar()); QVERIFY(succeededSoFar());
QVERIFY(parseFiles(testFile)); QVERIFY(parseFiles(testFile));
CppIndexingSupport *indexingSupport = m_modelManager->indexingSupport();
const QScopedPointer<SymbolSearcher> symbolSearcher( const QScopedPointer<SymbolSearcher> symbolSearcher(
indexingSupport->createSymbolSearcher(searchParameters, QSet<QString>{testFile})); new SymbolSearcher(searchParameters, QSet<QString>{testFile}));
QFuture<Core::SearchResultItem> search QFuture<Core::SearchResultItem> search
= Utils::runAsync(&SymbolSearcher::runSearch, symbolSearcher.data()); = Utils::runAsync(&SymbolSearcher::runSearch, symbolSearcher.data());
search.waitForFinished(); search.waitForFinished();

2
src/plugins/cppeditor/symbolsfindfilter.cpp
View File

@@ -116,7 +116,7 @@ void SymbolsFindFilter::startSearch(SearchResult *search)
connect(watcher, &QFutureWatcherBase::finished, this, [this, watcher] { finish(watcher); }); connect(watcher, &QFutureWatcherBase::finished, this, [this, watcher] { finish(watcher); });
connect(watcher, &QFutureWatcherBase::resultsReadyAt, this, [this, watcher] connect(watcher, &QFutureWatcherBase::resultsReadyAt, this, [this, watcher]
(int begin, int end) { addResults(watcher, begin, end); }); (int begin, int end) { addResults(watcher, begin, end); });
SymbolSearcher *symbolSearcher = m_manager->indexingSupport()->createSymbolSearcher(parameters, projectFileNames); SymbolSearcher *symbolSearcher = new SymbolSearcher(parameters, projectFileNames);
connect(watcher, &QFutureWatcherBase::finished, connect(watcher, &QFutureWatcherBase::finished,
symbolSearcher, &QObject::deleteLater); symbolSearcher, &QObject::deleteLater);
watcher->setFuture(Utils::runAsync(m_manager->sharedThreadPool(), watcher->setFuture(Utils::runAsync(m_manager->sharedThreadPool(),