From 2f44449a908672504a616e1e26d9b4abf13d42e7 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 17 Aug 2021 12:16:20 +0200 Subject: [PATCH] DiffEditor: Remove workingDir parameter from setDiff() It was not used. Change-Id: I33a77f4d8238218b90171a98aa25af5b31b17eb3 Reviewed-by: Orgad Shaneh --- src/plugins/diffeditor/diffeditor.cpp | 2 +- src/plugins/diffeditor/diffview.cpp | 8 ++++---- src/plugins/diffeditor/diffview.h | 6 +++--- .../diffeditor/sidebysidediffeditorwidget.cpp | 14 ++++---------- .../diffeditor/sidebysidediffeditorwidget.h | 3 +-- src/plugins/diffeditor/unifieddiffeditorwidget.cpp | 12 +++--------- src/plugins/diffeditor/unifieddiffeditorwidget.h | 3 +-- 7 files changed, 17 insertions(+), 31 deletions(-) diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index d14e6c21330..96a37853dba 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/src/plugins/diffeditor/diffeditor.cpp @@ -328,7 +328,7 @@ void DiffEditor::documentHasChanged() const QList &diffFileList = m_document->diffFiles(); updateDescription(); - currentView()->setDiff(diffFileList, m_document->baseDirectory()); + currentView()->setDiff(diffFileList); m_entriesComboBox->clear(); for (const FileData &diffFile : diffFileList) { diff --git a/src/plugins/diffeditor/diffview.cpp b/src/plugins/diffeditor/diffview.cpp index 1b68399e4dd..ebf2daf2626 100644 --- a/src/plugins/diffeditor/diffview.cpp +++ b/src/plugins/diffeditor/diffview.cpp @@ -141,10 +141,10 @@ void UnifiedView::beginOperation() m_widget->clear(tr("Waiting for data...")); } -void UnifiedView::setDiff(const QList &diffFileList, const QString &workingDirectory) +void UnifiedView::setDiff(const QList &diffFileList) { QTC_ASSERT(m_widget, return); - m_widget->setDiff(diffFileList, workingDirectory); + m_widget->setDiff(diffFileList); } void UnifiedView::endOperation(bool success) @@ -234,10 +234,10 @@ void SideBySideView::setCurrentDiffFileIndex(int index) m_widget->setCurrentDiffFileIndex(index); } -void SideBySideView::setDiff(const QList &diffFileList, const QString &workingDirectory) +void SideBySideView::setDiff(const QList &diffFileList) { QTC_ASSERT(m_widget, return); - m_widget->setDiff(diffFileList, workingDirectory); + m_widget->setDiff(diffFileList); } void SideBySideView::endOperation(bool success) diff --git a/src/plugins/diffeditor/diffview.h b/src/plugins/diffeditor/diffview.h index 417e654ba4c..0e476f3c1ab 100644 --- a/src/plugins/diffeditor/diffview.h +++ b/src/plugins/diffeditor/diffview.h @@ -63,7 +63,7 @@ public: virtual void beginOperation() = 0; virtual void setCurrentDiffFileIndex(int index) = 0; - virtual void setDiff(const QList &diffFileList, const QString &workingDirectory) = 0; + virtual void setDiff(const QList &diffFileList) = 0; virtual void endOperation(bool success) = 0; virtual void setSync(bool) = 0; @@ -100,7 +100,7 @@ public: void beginOperation() override; void setCurrentDiffFileIndex(int index) override; - void setDiff(const QList &diffFileList, const QString &workingDirectory) override; + void setDiff(const QList &diffFileList) override; void endOperation(bool success) override; void setSync(bool sync) override; @@ -124,7 +124,7 @@ public: void beginOperation() override; void setCurrentDiffFileIndex(int index) override; - void setDiff(const QList &diffFileList, const QString &workingDirectory) override; + void setDiff(const QList &diffFileList) override; void endOperation(bool success) override; void setSync(bool sync) override; diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp index ce8d7c59f4d..0f861506e25 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp @@ -828,12 +828,9 @@ void SideBySideDiffEditorWidget::setDocument(DiffEditorDocument *document) m_controller.setDocument(document); clear(); QList diffFileList; - QString workingDirectory; - if (document) { + if (document) diffFileList = document->diffFiles(); - workingDirectory = document->baseDirectory(); - } - setDiff(diffFileList, workingDirectory); + setDiff(diffFileList); } DiffEditorDocument *SideBySideDiffEditorWidget::diffDocument() const @@ -845,17 +842,14 @@ void SideBySideDiffEditorWidget::clear(const QString &message) { const bool oldIgnore = m_controller.m_ignoreCurrentIndexChange; m_controller.m_ignoreCurrentIndexChange = true; - setDiff(QList(), QString()); + setDiff(QList()); m_leftEditor->clearAll(message); m_rightEditor->clearAll(message); m_controller.m_ignoreCurrentIndexChange = oldIgnore; } -void SideBySideDiffEditorWidget::setDiff(const QList &diffFileList, - const QString &workingDirectory) +void SideBySideDiffEditorWidget::setDiff(const QList &diffFileList) { - Q_UNUSED(workingDirectory) - const bool oldIgnore = m_controller.m_ignoreCurrentIndexChange; m_controller.m_ignoreCurrentIndexChange = true; m_leftEditor->clear(); diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.h b/src/plugins/diffeditor/sidebysidediffeditorwidget.h index 2f635367d0e..00e4a1b7283 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.h +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.h @@ -63,8 +63,7 @@ public: void setDocument(DiffEditorDocument *document); DiffEditorDocument *diffDocument() const; - void setDiff(const QList &diffFileList, - const QString &workingDirectory); + void setDiff(const QList &diffFileList); void setCurrentDiffFileIndex(int diffFileIndex); void setHorizontalSync(bool sync); diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp index 622e460d119..fc187cc2378 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp @@ -89,12 +89,9 @@ void UnifiedDiffEditorWidget::setDocument(DiffEditorDocument *document) m_controller.setDocument(document); clear(); QList diffFileList; - QString workingDirectory; - if (document) { + if (document) diffFileList = document->diffFiles(); - workingDirectory = document->baseDirectory(); - } - setDiff(diffFileList, workingDirectory); + setDiff(diffFileList); } DiffEditorDocument *UnifiedDiffEditorWidget::diffDocument() const @@ -318,11 +315,8 @@ void UnifiedDiffEditorWidget::setChunkIndex(int startBlockNumber, m_chunkInfo.insert(startBlockNumber, qMakePair(blockCount, chunkIndex)); } -void UnifiedDiffEditorWidget::setDiff(const QList &diffFileList, - const QString &workingDirectory) +void UnifiedDiffEditorWidget::setDiff(const QList &diffFileList) { - Q_UNUSED(workingDirectory) - const bool oldIgnore = m_controller.m_ignoreCurrentIndexChange; m_controller.m_ignoreCurrentIndexChange = true; clear(); diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.h b/src/plugins/diffeditor/unifieddiffeditorwidget.h index d5f6811ded7..154ba03971d 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.h +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.h @@ -54,8 +54,7 @@ public: void setDocument(DiffEditorDocument *document); DiffEditorDocument *diffDocument() const; - void setDiff(const QList &diffFileList, - const QString &workingDirectory); + void setDiff(const QList &diffFileList); void setCurrentDiffFileIndex(int diffFileIndex); void saveState();