forked from qt-creator/qt-creator
BaseFileFind: Get rid of executeSearch()
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:
@@ -353,7 +353,7 @@ void BaseFileFind::runSearch(SearchResult *search)
|
||||
connect(watcher, &QFutureWatcherBase::finished, search, [watcher, search]() {
|
||||
search->finishSearch(watcher->isCanceled());
|
||||
});
|
||||
QFuture<SearchResultItems> future = executeSearch(parameters);
|
||||
QFuture<SearchResultItems> future = parameters.searchExecutor(parameters);
|
||||
watcher->setFuture(future);
|
||||
d->m_futureSynchronizer.addFuture(future);
|
||||
FutureProgress *progress = ProgressManager::addTask(future,
|
||||
@@ -592,11 +592,6 @@ FilePaths BaseFileFind::replaceAll(const QString &text, const SearchResultItems
|
||||
return changes.keys();
|
||||
}
|
||||
|
||||
QFuture<SearchResultItems> BaseFileFind::executeSearch(const FileFindParameters ¶meters)
|
||||
{
|
||||
return parameters.searchExecutor(parameters);
|
||||
}
|
||||
|
||||
namespace Internal {
|
||||
|
||||
} // namespace Internal
|
||||
|
||||
@@ -106,7 +106,6 @@ protected:
|
||||
virtual QString label() 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
|
||||
QFuture<Utils::SearchResultItems> executeSearch(const FileFindParameters ¶meters);
|
||||
|
||||
void writeCommonSettings(QSettings *settings);
|
||||
void readCommonSettings(QSettings *settings, const QString &defaultFilter, const QString &defaultExclusionFilter);
|
||||
|
||||
Reference in New Issue
Block a user