From 6f819c07cd8744c501df986b5f9154ac8cedaf92 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 28 Jun 2023 18:42:31 +0200
Subject: [PATCH] GitGrep: Pass GitGrepParameters through the lambda capture

Instead of using QVariant searchEngineParameters.

Change-Id: I30b2bf06fb16586b11e22410e1662d3127ae97be
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 src/plugins/git/gitgrep.cpp | 16 ++++++++--------
 src/plugins/git/gitgrep.h   |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/plugins/git/gitgrep.cpp b/src/plugins/git/gitgrep.cpp
index b0bc3549776..56ff5bd098e 100644
--- a/src/plugins/git/gitgrep.cpp
+++ b/src/plugins/git/gitgrep.cpp
@@ -245,13 +245,14 @@ QWidget *GitGrep::widget() const
     return m_widget;
 }
 
+GitGrepParameters GitGrep::gitParameters() const
+{
+    return {m_treeLineEdit->text(), m_recurseSubmodules && m_recurseSubmodules->isChecked()};
+}
+
 QVariant GitGrep::parameters() const
 {
-    GitGrepParameters params;
-    params.ref = m_treeLineEdit->text();
-    if (m_recurseSubmodules)
-        params.recurseSubmodules = m_recurseSubmodules->isChecked();
-    return QVariant::fromValue(params);
+    return QVariant::fromValue(gitParameters());
 }
 
 void GitGrep::readSettings(QSettings *settings)
@@ -271,9 +272,8 @@ QFuture<SearchResultItems> GitGrep::executeSearch(const FileFindParameters &para
 
 EditorOpener GitGrep::editorOpener() const
 {
-    return [](const Utils::SearchResultItem &item,
-              const FileFindParameters &parameters) -> IEditor * {
-        const GitGrepParameters params = parameters.searchEngineParameters.value<GitGrepParameters>();
+    return [params = gitParameters()](const Utils::SearchResultItem &item,
+                                      const FileFindParameters &parameters) -> IEditor * {
         const QStringList &itemPath = item.path();
         if (params.ref.isEmpty() || itemPath.isEmpty())
             return nullptr;
diff --git a/src/plugins/git/gitgrep.h b/src/plugins/git/gitgrep.h
index d4ef451d6ea..1c905f3667d 100644
--- a/src/plugins/git/gitgrep.h
+++ b/src/plugins/git/gitgrep.h
@@ -14,6 +14,7 @@ namespace Utils { class FancyLineEdit; }
 namespace Git::Internal {
 
 class GitClient;
+class GitGrepParameters;
 
 class GitGrep : public TextEditor::SearchEngine
 {
@@ -32,6 +33,7 @@ public:
     TextEditor::EditorOpener editorOpener() const override;
 
 private:
+    GitGrepParameters gitParameters() const;
     GitClient *m_client;
     QWidget *m_widget;
     Utils::FancyLineEdit *m_treeLineEdit;