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

BaseFileFind: Get rid of executeSearch()

Browse Source 
Use FileFindParameters::searchExecutor directly instead.

Change-Id: I03e5018c8094b69d3b21a4630956514b3abc7a1d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2023-06-28 19:37:32 +02:00
parent 453452864f
commit cf7a41e963
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/texteditor/basefilefind.cpp
View File

@@ -353,7 +353,7 @@ void BaseFileFind::runSearch(SearchResult *search)
connect(watcher, &QFutureWatcherBase::finished, search, [watcher, search]() { connect(watcher, &QFutureWatcherBase::finished, search, [watcher, search]() {
search->finishSearch(watcher->isCanceled()); search->finishSearch(watcher->isCanceled());
}); });
QFuture<SearchResultItems> future = executeSearch(parameters); QFuture<SearchResultItems> future = parameters.searchExecutor(parameters);
watcher->setFuture(future); watcher->setFuture(future);
d->m_futureSynchronizer.addFuture(future); d->m_futureSynchronizer.addFuture(future);
FutureProgress *progress = ProgressManager::addTask(future, FutureProgress *progress = ProgressManager::addTask(future,
@@ -592,11 +592,6 @@ FilePaths BaseFileFind::replaceAll(const QString &text, const SearchResultItems
return changes.keys(); return changes.keys();
} }
QFuture<SearchResultItems> BaseFileFind::executeSearch(const FileFindParameters &parameters)
{
return parameters.searchExecutor(parameters);
}
namespace Internal { namespace Internal {
} // namespace Internal } // namespace Internal

1
src/plugins/texteditor/basefilefind.h
View File

@@ -106,7 +106,6 @@ protected:
virtual QString label() const = 0; // see Core::SearchResultWindow::startNewSearch virtual QString label() const = 0; // see Core::SearchResultWindow::startNewSearch
virtual QString toolTip() const = 0; // see Core::SearchResultWindow::startNewSearch, virtual QString toolTip() const = 0; // see Core::SearchResultWindow::startNewSearch,
// add %1 placeholder where the find flags should be put // add %1 placeholder where the find flags should be put
QFuture<Utils::SearchResultItems> executeSearch(const FileFindParameters &parameters);
void writeCommonSettings(QSettings *settings); void writeCommonSettings(QSettings *settings);
void readCommonSettings(QSettings *settings, const QString &defaultFilter, const QString &defaultExclusionFilter); void readCommonSettings(QSettings *settings, const QString &defaultFilter, const QString &defaultExclusionFilter);