aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/silversearcher
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2023-06-28 17:03:58 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2023-07-04 12:23:05 +0000
commitde5efffeff8a2adebc77fd2b6888047abf8530a5 (patch)
treeccf7599cc4c9f132e0a547f824f5d70717b417db /src/plugins/silversearcher
parent6e16512eba2c39baa714fa253843b2171ba24f47 (diff)
BaseFileFind: Replace files() with fileContainerProvider()
The fileContainerProvider() is called only once per SearchResult instance, and the result (the provider) is stored inside FileFindParameters. In this way the extra data, like the name filters or the search directory, are set just once. Whenever the search is started (or started again), the stored provider recreates the FileContainer according to the data that has been captured by the lambda when the provider was created. This patch eliminates the need for retrieving the custom data from QVariant. It also eliminates the set of arbitrary arguments for the removed files() method. Remove the BaseFileFind * argument from the SearchEngine::executeSearch() method. Change-Id: I7211f503f82db12b5a99c9d342466daaaae0839f Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/silversearcher')
-rw-r--r--src/plugins/silversearcher/findinfilessilversearcher.cpp2
-rw-r--r--src/plugins/silversearcher/findinfilessilversearcher.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/silversearcher/findinfilessilversearcher.cpp b/src/plugins/silversearcher/findinfilessilversearcher.cpp
index 6cf428bb64f..f607ae51498 100644
--- a/src/plugins/silversearcher/findinfilessilversearcher.cpp
+++ b/src/plugins/silversearcher/findinfilessilversearcher.cpp
@@ -165,7 +165,7 @@ void FindInFilesSilverSearcher::writeSettings(QSettings *settings) const
}
QFuture<SearchResultItems> FindInFilesSilverSearcher::executeSearch(
- const FileFindParameters &parameters, BaseFileFind * /*baseFileFind*/)
+ const FileFindParameters &parameters)
{
return Utils::asyncRun(runSilverSeacher, parameters);
}
diff --git a/src/plugins/silversearcher/findinfilessilversearcher.h b/src/plugins/silversearcher/findinfilessilversearcher.h
index bc5e224c21f..b70684f6ec8 100644
--- a/src/plugins/silversearcher/findinfilessilversearcher.h
+++ b/src/plugins/silversearcher/findinfilessilversearcher.h
@@ -32,7 +32,7 @@ public:
void readSettings(QSettings *settings) override;
void writeSettings(QSettings *settings) const override;
QFuture<Utils::SearchResultItems> executeSearch(
- const TextEditor::FileFindParameters &parameters, TextEditor::BaseFileFind *) override;
+ const TextEditor::FileFindParameters &parameters) override;
Core::IEditor *openEditor(const Utils::SearchResultItem &item,
const TextEditor::FileFindParameters &parameters) override;