From 2632f66672b8c44f060c07e86338b60600bc7c35 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 16 Jan 2024 16:14:52 +0100 Subject: [PATCH] VcsBase: Get rid of unused extraOptions arg Change-Id: Ie434a2cd3b4e84465fe3ae419604bda184bcd34a Reviewed-by: Orgad Shaneh --- src/plugins/vcsbase/vcsbaseclient.cpp | 8 ++------ src/plugins/vcsbase/vcsbaseclient.h | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index 7460024e225..5f6a854da35 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -353,8 +353,7 @@ void VcsBaseClient::annotate(const Utils::FilePath &workingDir, const QString &f enqueueJob(cmd, args); } -void VcsBaseClient::diff(const FilePath &workingDir, const QStringList &files, - const QStringList &extraOptions) +void VcsBaseClient::diff(const FilePath &workingDir, const QStringList &files) { const QString vcsCmdString = vcsCommandString(DiffCommand); const Id kind = vcsEditorKind(DiffCommand); @@ -371,12 +370,11 @@ void VcsBaseClient::diff(const FilePath &workingDir, const QStringList &files, if (m_diffConfigCreator) paramWidget = m_diffConfigCreator(editor->toolBar()); if (paramWidget) { - paramWidget->setBaseArguments(extraOptions); // editor has been just created, createVcsEditor() didn't set a configuration widget yet connect(editor, &VcsBaseEditorWidget::diffChunkReverted, paramWidget, &VcsBaseEditorConfig::executeCommand); connect(paramWidget, &VcsBaseEditorConfig::commandExecutionRequested, - this, [=] { diff(workingDir, files, extraOptions); }); + this, [this, workingDir, files] { diff(workingDir, files); }); editor->setEditorConfig(paramWidget); } } @@ -384,8 +382,6 @@ void VcsBaseClient::diff(const FilePath &workingDir, const QStringList &files, QStringList args = {vcsCmdString}; if (paramWidget) args << paramWidget->arguments(); - else - args << extraOptions; args << files; QTextCodec *codec = source.isEmpty() ? static_cast(nullptr) : VcsBaseEditor::getCodec(source); diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h index 61b180311a2..9f5f9841f19 100644 --- a/src/plugins/vcsbase/vcsbaseclient.h +++ b/src/plugins/vcsbase/vcsbaseclient.h @@ -146,9 +146,7 @@ public: void annotate(const Utils::FilePath &workingDir, const QString &file, int lineNumber = -1, const QString &revision = {}, const QStringList &extraOptions = {}, int firstLine = -1) override; - void diff(const Utils::FilePath &workingDir, - const QStringList &files = {}, - const QStringList &extraOptions = {}); + void diff(const Utils::FilePath &workingDir, const QStringList &files = {}); virtual void log(const Utils::FilePath &workingDir, const QStringList &files = {}, const QStringList &extraOptions = {},