DiffEditorController: Simplify API

Get rid of VcsBaseDiffEditorController::setWorkingDirectory()
and rename DiffEditorController::setBaseDirectory() into
setWorkingDirectory(). Don't pass workingDirectory
inside setDiffFiles().

Change-Id: I6a3a02d5e3ddc23977ed2908cd8d7b8ed51a9ee0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 34c357b2c5..5235f8a21b 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -256,10 +256,10 @@ private:
             setupDiffProcessor(async, storage->m_stagedOutput + storage->m_unstagedOutput);
         };
         const auto onProcessDiffDone = [this, storage](const AsyncTask<QList<FileData>> &async) {
-            setDiffFiles(async.result(), workingDirectory());
+            setDiffFiles(async.result());
         };
         const auto onProcessDiffError = [this, storage](const AsyncTask<QList<FileData>> &) {
-            setDiffFiles({}, workingDirectory());
+            setDiffFiles({});
         };
 
         const Group root {
@@ -474,10 +474,10 @@ Tasking::Group ShowController::reloadRecipe()
         setupDiffProcessor(async, storage->m_diffOutput);
     };
     const auto onProcessDiffDone = [this, storage](const AsyncTask<QList<FileData>> &async) {
-        setDiffFiles(async.result(), workingDirectory());
+        setDiffFiles(async.result());
     };
     const auto onProcessDiffError = [this, storage](const AsyncTask<QList<FileData>> &) {
-        setDiffFiles({}, workingDirectory());
+        setDiffFiles({});
     };
 
     const Group root {
@@ -915,7 +915,7 @@ void GitClient::stage(DiffEditor::DiffEditorController *diffController,
     if (!patchFile.open())
         return;
 
-    const FilePath baseDir = diffController->baseDirectory();
+    const FilePath baseDir = diffController->workingDirectory();
     QTextCodec *codec = EditorManager::defaultTextCodec();
     const QByteArray patchData = codec
             ? codec->fromUnicode(patch) : patch.toLocal8Bit();