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

VcsBase: Get rid of unused extraOptions arg

Browse Source 
Change-Id: Ie434a2cd3b4e84465fe3ae419604bda184bcd34a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2024-01-16 16:14:52 +01:00
parent e4c47b8d1c
commit 2632f66672
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/vcsbase/vcsbaseclient.cpp
View File

@@ -353,8 +353,7 @@ void VcsBaseClient::annotate(const Utils::FilePath &workingDir, const QString &f
enqueueJob(cmd, args); enqueueJob(cmd, args);
} }
void VcsBaseClient::diff(const FilePath &workingDir, const QStringList &files, void VcsBaseClient::diff(const FilePath &workingDir, const QStringList &files)
const QStringList &extraOptions)
{ {
const QString vcsCmdString = vcsCommandString(DiffCommand); const QString vcsCmdString = vcsCommandString(DiffCommand);
const Id kind = vcsEditorKind(DiffCommand); const Id kind = vcsEditorKind(DiffCommand);
@@ -371,12 +370,11 @@ void VcsBaseClient::diff(const FilePath &workingDir, const QStringList &files,
if (m_diffConfigCreator) if (m_diffConfigCreator)
paramWidget = m_diffConfigCreator(editor->toolBar()); paramWidget = m_diffConfigCreator(editor->toolBar());
if (paramWidget) { if (paramWidget) {
paramWidget->setBaseArguments(extraOptions);
// editor has been just created, createVcsEditor() didn't set a configuration widget yet // editor has been just created, createVcsEditor() didn't set a configuration widget yet
connect(editor, &VcsBaseEditorWidget::diffChunkReverted, connect(editor, &VcsBaseEditorWidget::diffChunkReverted,
paramWidget, &VcsBaseEditorConfig::executeCommand); paramWidget, &VcsBaseEditorConfig::executeCommand);
connect(paramWidget, &VcsBaseEditorConfig::commandExecutionRequested, connect(paramWidget, &VcsBaseEditorConfig::commandExecutionRequested,
this, [=] { diff(workingDir, files, extraOptions); }); this, [this, workingDir, files] { diff(workingDir, files); });
editor->setEditorConfig(paramWidget); editor->setEditorConfig(paramWidget);
} }
} }
@@ -384,8 +382,6 @@ void VcsBaseClient::diff(const FilePath &workingDir, const QStringList &files,
QStringList args = {vcsCmdString}; QStringList args = {vcsCmdString};
if (paramWidget) if (paramWidget)
args << paramWidget->arguments(); args << paramWidget->arguments();
else
args << extraOptions;
args << files; args << files;
QTextCodec *codec = source.isEmpty() ? static_cast<QTextCodec *>(nullptr) QTextCodec *codec = source.isEmpty() ? static_cast<QTextCodec *>(nullptr)
: VcsBaseEditor::getCodec(source); : VcsBaseEditor::getCodec(source);

4
src/plugins/vcsbase/vcsbaseclient.h
View File

@@ -146,9 +146,7 @@ public:
void annotate(const Utils::FilePath &workingDir, const QString &file, void annotate(const Utils::FilePath &workingDir, const QString &file,
int lineNumber = -1, const QString &revision = {}, int lineNumber = -1, const QString &revision = {},
const QStringList &extraOptions = {}, int firstLine = -1) override; const QStringList &extraOptions = {}, int firstLine = -1) override;
void diff(const Utils::FilePath &workingDir, void diff(const Utils::FilePath &workingDir, const QStringList &files = {});
const QStringList &files = {},
const QStringList &extraOptions = {});
virtual void log(const Utils::FilePath &workingDir, virtual void log(const Utils::FilePath &workingDir,
const QStringList &files = {}, const QStringList &files = {},
const QStringList &extraOptions = {}, const QStringList &extraOptions = {},