BaseFileFind: Replace additionalParameters() with searchDir()

The FileFindParameters::additionalParameters,
holding QVariant, was ambiguous. Since GitGrep and
SilverSearcher need a search directory input
unconditionally, replace the additionalParameters field
with searchDir of FilePath type. For Internal
search engine, this field isn't used - the searchDir
is already passed in FindInFiles::fileContainerProvider()
with lambda capture; for other BaseFileFind subclasses,
not combined with non-Internal search engine, the field
isn't used anyway.

This change closes the chain of patches to eliminate
the usage of ambiguous QVariant type inside FileFindParameters.

Change-Id: Icddd1cfe46e86ea892221862d9d267f9c9fa173c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

8 files changed, 8 insertions, 26 deletions

diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp
index 7435d00b26..4372abba6b 100644
--- a/src/plugins/texteditor/basefilefind.cpp
+++ b/src/plugins/texteditor/basefilefind.cpp
@@ -313,7 +313,7 @@ void BaseFileFind::runNewSearch(const QString &txt, FindFlags findFlags,
     parameters.flags = findFlags;
     parameters.nameFilters = fileNameFilters();
     parameters.exclusionFilters = fileExclusionFilters();
-    parameters.additionalParameters = additionalParameters();
+    parameters.searchDir = searchDir();
     parameters.fileContainerProvider = fileContainerProvider();
     parameters.editorOpener = searchEngine->editorOpener();
     parameters.searchExecutor = searchEngine->searchExecutor();
diff --git a/src/plugins/texteditor/basefilefind.h b/src/plugins/texteditor/basefilefind.h
index 58a51263ca..da740d15bc 100644
--- a/src/plugins/texteditor/basefilefind.h
+++ b/src/plugins/texteditor/basefilefind.h
@@ -40,7 +40,7 @@ public:
     QString text;
     QStringList nameFilters;
     QStringList exclusionFilters;
-    QVariant additionalParameters;
+    Utils::FilePath searchDir;
     Utils::FindFlags flags;
     FileContainerProvider fileContainerProvider = {};
     EditorOpener editorOpener = {};
@@ -102,7 +102,7 @@ public:
                                        bool preserveCase = false);
 
 protected:
-    virtual QVariant additionalParameters() const = 0;
+    virtual Utils::FilePath searchDir() const { return {}; }
     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
diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp
index 197d02f53e..2a61602569 100644
--- a/src/plugins/texteditor/findincurrentfile.cpp
+++ b/src/plugins/texteditor/findincurrentfile.cpp
@@ -47,11 +47,6 @@ FileContainerProvider FindInCurrentFile::fileContainerProvider() const
     };
 }
 
-QVariant FindInCurrentFile::additionalParameters() const
-{
-    return m_currentDocument->filePath().toVariant();
-}
-
 QString FindInCurrentFile::label() const
 {
     return Tr::tr("File \"%1\":").arg(m_currentDocument->filePath().fileName());
diff --git a/src/plugins/texteditor/findincurrentfile.h b/src/plugins/texteditor/findincurrentfile.h
index 5eb75de05b..7b0b17712c 100644
--- a/src/plugins/texteditor/findincurrentfile.h
+++ b/src/plugins/texteditor/findincurrentfile.h
@@ -29,7 +29,6 @@ public:
     void readSettings(QSettings *settings) override;
 
 protected:
-    QVariant additionalParameters() const override;
     QString label() const override;
     QString toolTip() const override;
 
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp
index 3f073f8229..89a4c0763b 100644
--- a/src/plugins/texteditor/findinfiles.cpp
+++ b/src/plugins/texteditor/findinfiles.cpp
@@ -61,23 +61,18 @@ QString FindInFiles::displayName() const
 FileContainerProvider FindInFiles::fileContainerProvider() const
 {
     return [nameFilters = fileNameFilters(), exclusionFilters = fileExclusionFilters(),
-            filePath = path()] {
+            filePath = searchDir()] {
         return SubDirFileContainer({filePath}, nameFilters, exclusionFilters,
                                    EditorManager::defaultTextCodec());
     };
 }
 
-QVariant FindInFiles::additionalParameters() const
-{
-    return path().toVariant();
-}
-
 QString FindInFiles::label() const
 {
     QString title = currentSearchEngine()->title();
 
     const QChar slash = QLatin1Char('/');
-    const QStringList &nonEmptyComponents = path().toFileInfo().absoluteFilePath()
+    const QStringList &nonEmptyComponents = searchDir().toFileInfo().absoluteFilePath()
             .split(slash, Qt::SkipEmptyParts);
     return Tr::tr("%1 \"%2\":")
             .arg(title)
@@ -88,7 +83,7 @@ QString FindInFiles::toolTip() const
 {
     //: the last arg is filled by BaseFileFind::runNewSearch
     QString tooltip = Tr::tr("Path: %1\nFilter: %2\nExcluding: %3\n%4")
-            .arg(path().toUserOutput())
+            .arg(searchDir().toUserOutput())
             .arg(fileNameFilters().join(','))
             .arg(fileExclusionFilters().join(','));
 
@@ -186,7 +181,7 @@ QWidget *FindInFiles::createConfigWidget()
     return m_configWidget;
 }
 
-FilePath FindInFiles::path() const
+FilePath FindInFiles::searchDir() const
 {
     return m_directory->filePath();
 }
diff --git a/src/plugins/texteditor/findinfiles.h b/src/plugins/texteditor/findinfiles.h
index 3713ab0b1d..d874e11038 100644
--- a/src/plugins/texteditor/findinfiles.h
+++ b/src/plugins/texteditor/findinfiles.h
@@ -44,7 +44,7 @@ signals:
     void pathChanged(const Utils::FilePath &directory);
 
 protected:
-    QVariant additionalParameters() const override;
+    Utils::FilePath searchDir() const override;
     QString label() const override;
     QString toolTip() const override;
     void syncSearchEngineCombo(int selectedSearchEngineIndex) override;
@@ -53,7 +53,6 @@ private:
     FileContainerProvider fileContainerProvider() const override;
     void setValid(bool valid);
     void searchEnginesSelectionChanged(int index);
-    Utils::FilePath path() const;
 
     QPointer<QWidget> m_configWidget;
     QPointer<Utils::PathChooser> m_directory;
diff --git a/src/plugins/texteditor/findinopenfiles.cpp b/src/plugins/texteditor/findinopenfiles.cpp
index 6b3e7dbe9c..2f2ee8de1d 100644
--- a/src/plugins/texteditor/findinopenfiles.cpp
+++ b/src/plugins/texteditor/findinopenfiles.cpp
@@ -57,11 +57,6 @@ FileContainerProvider FindInOpenFiles::fileContainerProvider() const
     };
 }
 
-QVariant FindInOpenFiles::additionalParameters() const
-{
-    return {};
-}
-
 QString FindInOpenFiles::label() const
 {
     return Tr::tr("Open documents:");
diff --git a/src/plugins/texteditor/findinopenfiles.h b/src/plugins/texteditor/findinopenfiles.h
index a96cd4f061..969a5ea531 100644
--- a/src/plugins/texteditor/findinopenfiles.h
+++ b/src/plugins/texteditor/findinopenfiles.h
@@ -22,7 +22,6 @@ public:
     void readSettings(QSettings *settings) override;
 
 protected:
-    QVariant additionalParameters() const override;
     QString label() const override;
     QString toolTip() const override;