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

GitGrep: Pass GitGrepParameters through the lambda capture

Browse Source 
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>
This commit is contained in:
Jarek Kobus
2023-06-28 18:42:31 +02:00
parent 858ecf3e78
commit 6f819c07cd
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/git/gitgrep.cpp
View File

@@ -245,13 +245,14 @@ QWidget *GitGrep::widget() const
return m_widget; return m_widget;
} }
GitGrepParameters GitGrep::gitParameters() const
{
return {m_treeLineEdit->text(), m_recurseSubmodules && m_recurseSubmodules->isChecked()};
}
QVariant GitGrep::parameters() const QVariant GitGrep::parameters() const
{ {
GitGrepParameters params; return QVariant::fromValue(gitParameters());
params.ref = m_treeLineEdit->text();
if (m_recurseSubmodules)
params.recurseSubmodules = m_recurseSubmodules->isChecked();
return QVariant::fromValue(params);
} }
void GitGrep::readSettings(QSettings *settings) void GitGrep::readSettings(QSettings *settings)
@@ -271,9 +272,8 @@ QFuture<SearchResultItems> GitGrep::executeSearch(const FileFindParameters &para
EditorOpener GitGrep::editorOpener() const EditorOpener GitGrep::editorOpener() const
{ {
return [](const Utils::SearchResultItem &item, return [params = gitParameters()](const Utils::SearchResultItem &item,
const FileFindParameters &parameters) -> IEditor * { const FileFindParameters &parameters) -> IEditor * {
const GitGrepParameters params = parameters.searchEngineParameters.value<GitGrepParameters>();
const QStringList &itemPath = item.path(); const QStringList &itemPath = item.path();
if (params.ref.isEmpty() || itemPath.isEmpty()) if (params.ref.isEmpty() || itemPath.isEmpty())
return nullptr; return nullptr;

2
src/plugins/git/gitgrep.h
View File

@@ -14,6 +14,7 @@ namespace Utils { class FancyLineEdit; }
namespace Git::Internal { namespace Git::Internal {
class GitClient; class GitClient;
class GitGrepParameters;
class GitGrep : public TextEditor::SearchEngine class GitGrep : public TextEditor::SearchEngine
{ {
@@ -32,6 +33,7 @@ public:
TextEditor::EditorOpener editorOpener() const override; TextEditor::EditorOpener editorOpener() const override;
private: private:
GitGrepParameters gitParameters() const;
GitClient *m_client; GitClient *m_client;
QWidget *m_widget; QWidget *m_widget;
Utils::FancyLineEdit *m_treeLineEdit; Utils::FancyLineEdit *m_treeLineEdit;