From 0f52acfe1cea8f1dbd053dac56f1318f902f1dfe Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Thu, 15 Dec 2022 17:32:45 +0100
Subject: [PATCH] DiffEditorController: Remove unused stuff

Change-Id: Ie4d5b0b3bac3e46c5db647263757222979b982be
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 .../diffeditor/diffeditorcontroller.cpp       | 22 ++-----------------
 src/plugins/diffeditor/diffeditorcontroller.h | 21 +++++-------------
 2 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/src/plugins/diffeditor/diffeditorcontroller.cpp b/src/plugins/diffeditor/diffeditorcontroller.cpp
index 8822b1e4d44..ffc1c7375c5 100644
--- a/src/plugins/diffeditor/diffeditorcontroller.cpp
+++ b/src/plugins/diffeditor/diffeditorcontroller.cpp
@@ -7,8 +7,6 @@
 #include "diffeditordocument.h"
 
 #include <coreplugin/editormanager/editormanager.h>
-#include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/icore.h>
 #include <coreplugin/progressmanager/taskprogress.h>
 
 #include <utils/qtcassert.h>
@@ -29,7 +27,7 @@ DiffEditorController::DiffEditorController(IDocument *document)
 
 bool DiffEditorController::isReloading() const
 {
-    return m_isReloading;
+    return m_taskTree.get() != nullptr;
 }
 
 FilePath DiffEditorController::workingDirectory() const
@@ -86,11 +84,6 @@ void DiffEditorController::setDescription(const QString &description)
     m_document->setDescription(description);
 }
 
-QString DiffEditorController::description() const
-{
-    return m_document->description();
-}
-
 /**
  * @brief Force the lines of context to the given number.
  *
@@ -104,11 +97,6 @@ void DiffEditorController::forceContextLineCount(int lines)
     m_document->forceContextLineCount(lines);
 }
 
-void DiffEditorController::setReloader(const std::function<void ()> &reloader)
-{
-    m_reloader = reloader;
-}
-
 IDocument *DiffEditorController::document() const
 {
     return m_document;
@@ -119,17 +107,12 @@ IDocument *DiffEditorController::document() const
  */
 void DiffEditorController::requestReload()
 {
-    m_isReloading = true;
     m_document->beginReload();
-    if (m_reloader) {
-        m_reloader();
-        return;
-    }
     m_taskTree.reset(new TaskTree(m_reloadRecipe));
     connect(m_taskTree.get(), &TaskTree::done, this, [this] { reloadFinished(true); });
     connect(m_taskTree.get(), &TaskTree::errorOccurred, this, [this] { reloadFinished(false); });
     auto progress = new TaskProgress(m_taskTree.get());
-    progress->setDisplayName(displayName());
+    progress->setDisplayName(m_displayName);
     m_taskTree->start();
 }
 
@@ -138,7 +121,6 @@ void DiffEditorController::reloadFinished(bool success)
     if (m_taskTree)
         m_taskTree.release()->deleteLater();
     m_document->endReload(success);
-    m_isReloading = false;
 }
 
 void DiffEditorController::setStartupFile(const QString &startupFile)
diff --git a/src/plugins/diffeditor/diffeditorcontroller.h b/src/plugins/diffeditor/diffeditorcontroller.h
index 2efb45ead42..846b10cb911 100644
--- a/src/plugins/diffeditor/diffeditorcontroller.h
+++ b/src/plugins/diffeditor/diffeditorcontroller.h
@@ -60,31 +60,22 @@ signals:
                                const ChunkSelection &selection);
 
 protected:
-    void setDisplayName(const QString &name) { m_displayName = name; }
-    QString displayName() const { return m_displayName; }
-
+    // Core functions:
     void setReloadRecipe(const Utils::Tasking::Group &recipe) { m_reloadRecipe = recipe; }
-
-    // reloadFinished() should be called inside the reloader (for synchronous reload)
-    // or later (for asynchronous reload)
-    void setReloader(const std::function<void ()> &reloader);
-    void reloadFinished(bool success);
-
-    void setStartupFile(const QString &startupFile);
     void setDiffFiles(const QList<FileData> &diffFileList);
+    // Optional:
+    void setDisplayName(const QString &name) { m_displayName = name; }
     void setDescription(const QString &description);
-    QString description() const;
+    void setStartupFile(const QString &startupFile);
     void forceContextLineCount(int lines);
 
 private:
+    void reloadFinished(bool success);
+
     Internal::DiffEditorDocument *const m_document;
-    bool m_isReloading = false;
     QString m_displayName;
-    std::function<void()> m_reloader;
     std::unique_ptr<Utils::TaskTree> m_taskTree;
     Utils::Tasking::Group m_reloadRecipe;
-
-    friend class Internal::DiffEditorDocument;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(DiffEditorController::PatchOptions)