DiffEditor: Remove workingDir parameter from setDiff()

It was not used.

Change-Id: I33a77f4d8238218b90171a98aa25af5b31b17eb3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

src/plugins/diffeditor/diffeditor.cpp

@@ -328,7 +328,7 @@ void DiffEditor::documentHasChanged()
     const QList<FileData> &diffFileList = m_document->diffFiles();
 
     updateDescription();
-    currentView()->setDiff(diffFileList, m_document->baseDirectory());
+    currentView()->setDiff(diffFileList);
 
     m_entriesComboBox->clear();
     for (const FileData &diffFile : diffFileList) {

src/plugins/diffeditor/diffview.cpp

@@ -141,10 +141,10 @@ void UnifiedView::beginOperation()
     m_widget->clear(tr("Waiting for data..."));
 }
 
-void UnifiedView::setDiff(const QList<FileData> &diffFileList, const QString &workingDirectory)
+void UnifiedView::setDiff(const QList<FileData> &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<FileData> &diffFileList, const QString &workingDirectory)
+void SideBySideView::setDiff(const QList<FileData> &diffFileList)
 {
     QTC_ASSERT(m_widget, return);
-    m_widget->setDiff(diffFileList, workingDirectory);
+    m_widget->setDiff(diffFileList);
 }
 
 void SideBySideView::endOperation(bool success)

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<FileData> &diffFileList, const QString &workingDirectory) = 0;
+    virtual void setDiff(const QList<FileData> &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<FileData> &diffFileList, const QString &workingDirectory) override;
+    void setDiff(const QList<FileData> &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<FileData> &diffFileList, const QString &workingDirectory) override;
+    void setDiff(const QList<FileData> &diffFileList) override;
     void endOperation(bool success) override;
 
     void setSync(bool sync) override;

src/plugins/diffeditor/sidebysidediffeditorwidget.cpp

@@ -828,12 +828,9 @@ void SideBySideDiffEditorWidget::setDocument(DiffEditorDocument *document)
     m_controller.setDocument(document);
     clear();
     QList<FileData> diffFileList;
-    QString workingDirectory;
+    if (document)
-    if (document) {
         diffFileList = document->diffFiles();
-        workingDirectory = document->baseDirectory();
+    setDiff(diffFileList);
-    }
-    setDiff(diffFileList, workingDirectory);
 }
 
 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<FileData>(), QString());
+    setDiff(QList<FileData>());
     m_leftEditor->clearAll(message);
     m_rightEditor->clearAll(message);
     m_controller.m_ignoreCurrentIndexChange = oldIgnore;
 }
 
-void SideBySideDiffEditorWidget::setDiff(const QList<FileData> &diffFileList,
+void SideBySideDiffEditorWidget::setDiff(const QList<FileData> &diffFileList)
-                                         const QString &workingDirectory)
 {
-    Q_UNUSED(workingDirectory)
-
     const bool oldIgnore = m_controller.m_ignoreCurrentIndexChange;
     m_controller.m_ignoreCurrentIndexChange = true;
     m_leftEditor->clear();

src/plugins/diffeditor/sidebysidediffeditorwidget.h

@@ -63,8 +63,7 @@ public:
     void setDocument(DiffEditorDocument *document);
     DiffEditorDocument *diffDocument() const;
 
-    void setDiff(const QList<FileData> &diffFileList,
+    void setDiff(const QList<FileData> &diffFileList);
-                 const QString &workingDirectory);
     void setCurrentDiffFileIndex(int diffFileIndex);
 
     void setHorizontalSync(bool sync);

src/plugins/diffeditor/unifieddiffeditorwidget.cpp

@@ -89,12 +89,9 @@ void UnifiedDiffEditorWidget::setDocument(DiffEditorDocument *document)
     m_controller.setDocument(document);
     clear();
     QList<FileData> diffFileList;
-    QString workingDirectory;
+    if (document)
-    if (document) {
         diffFileList = document->diffFiles();
-        workingDirectory = document->baseDirectory();
+    setDiff(diffFileList);
-    }
-    setDiff(diffFileList, workingDirectory);
 }
 
 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<FileData> &diffFileList,
+void UnifiedDiffEditorWidget::setDiff(const QList<FileData> &diffFileList)
-                                      const QString &workingDirectory)
 {
-    Q_UNUSED(workingDirectory)
-
     const bool oldIgnore = m_controller.m_ignoreCurrentIndexChange;
     m_controller.m_ignoreCurrentIndexChange = true;
     clear();

src/plugins/diffeditor/unifieddiffeditorwidget.h

@@ -54,8 +54,7 @@ public:
     void setDocument(DiffEditorDocument *document);
     DiffEditorDocument *diffDocument() const;
 
-    void setDiff(const QList<FileData> &diffFileList,
+    void setDiff(const QList<FileData> &diffFileList);
-                 const QString &workingDirectory);
     void setCurrentDiffFileIndex(int diffFileIndex);
 
     void saveState();