From 0a7f76ca8d91bc4a0308921fca34bcc5b4450964 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 2 Aug 2022 10:43:28 +0200
Subject: [PATCH] VcsCommand: Get rid of setCookie()

Remove cookie arg from finished() signal, as it's not used
currently. Thus, remove setCookie() method.

Change-Id: Iedd328aece776eebd2d161a36ec28370b8bc4bfc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/git/gitclient.cpp         | 7 ++-----
 src/plugins/vcsbase/vcsbaseclient.cpp | 3 +--
 src/plugins/vcsbase/vcsbaseclient.h   | 3 +--
 src/plugins/vcsbase/vcscommand.cpp    | 8 +-------
 src/plugins/vcsbase/vcscommand.h      | 4 +---
 5 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 2a40c2a0d5f..abdba26e05e 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -344,11 +344,8 @@ void GitBaseDiffEditorController::updateBranchList()
     if (revision.isEmpty())
         return;
 
-    const FilePath workingDirectory = baseDirectory();
-    VcsCommand *command = m_instance->vcsExec(
-                workingDirectory,
-                {"branch", noColorOption, "-a", "--contains", revision}, nullptr,
-                false, 0, workingDirectory.toString());
+    VcsCommand *command = m_instance->vcsExec(baseDirectory(),
+                          {"branch", noColorOption, "-a", "--contains", revision});
     connect(command, &VcsCommand::stdOutText, this, [this](const QString &text) {
         const QString remotePrefix = "remotes/";
         const QString localPrefix = "<Local>";
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index 901a49aa6d7..aa65ffca3cb 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -194,11 +194,10 @@ void VcsBaseClientImpl::annotateRevisionRequested(const FilePath &workingDirecto
 VcsCommand *VcsBaseClientImpl::vcsExec(const FilePath &workingDirectory,
                                        const QStringList &arguments,
                                        VcsBaseEditorWidget *editor, bool useOutputToWindow,
-                                       unsigned additionalFlags, const QVariant &cookie) const
+                                       unsigned additionalFlags) const
 {
     VcsCommand *command = createCommand(workingDirectory, editor,
                                         useOutputToWindow ? VcsWindowOutputBind : NoOutputBind);
-    command->setCookie(cookie);
     command->addFlags(additionalFlags);
     if (editor)
         command->setCodec(editor->codec());
diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h
index 0b4eb9c2a17..20c6a135a4c 100644
--- a/src/plugins/vcsbase/vcsbaseclient.h
+++ b/src/plugins/vcsbase/vcsbaseclient.h
@@ -115,8 +115,7 @@ public:
                         const QStringList &arguments,
                         VcsBaseEditorWidget *editor = nullptr,
                         bool useOutputToWindow = false,
-                        unsigned additionalFlags = 0,
-                        const QVariant &cookie = {}) const;
+                        unsigned additionalFlags = 0) const;
 
 protected:
     void resetCachedVcsInfo(const Utils::FilePath &workingDir);
diff --git a/src/plugins/vcsbase/vcscommand.cpp b/src/plugins/vcsbase/vcscommand.cpp
index 95bf10e2403..d1babf60823 100644
--- a/src/plugins/vcsbase/vcscommand.cpp
+++ b/src/plugins/vcsbase/vcscommand.cpp
@@ -105,7 +105,6 @@ public:
     QString m_displayName;
     const FilePath m_defaultWorkingDirectory;
     Environment m_environment;
-    QVariant m_cookie;
     QTextCodec *m_codec = nullptr;
     ProgressParser *m_progressParser = nullptr;
     QFutureWatcher<void> m_watcher;
@@ -325,7 +324,7 @@ void VcsCommand::run(QFutureInterface<void> &future)
                 GlobalFileChangeBlocker::instance()->forceBlocked(false);
             });
         }
-        emit finished(lastExecSuccess, d->m_cookie);
+        emit finished(lastExecSuccess);
         if (lastExecSuccess)
             future.setProgressValue(future.progressMaximum());
         else
@@ -440,11 +439,6 @@ void VcsCommand::runSynchronous(QtcProcess &process)
     process.runBlocking(EventLoopMode::On);
 }
 
-void VcsCommand::setCookie(const QVariant &cookie)
-{
-    d->m_cookie = cookie;
-}
-
 void VcsCommand::setCodec(QTextCodec *codec)
 {
     d->m_codec = codec;
diff --git a/src/plugins/vcsbase/vcscommand.h b/src/plugins/vcsbase/vcscommand.h
index 62383f898ec..da90a2149ab 100644
--- a/src/plugins/vcsbase/vcscommand.h
+++ b/src/plugins/vcsbase/vcscommand.h
@@ -140,8 +140,6 @@ public:
 
     void addFlags(unsigned f);
 
-    void setCookie(const QVariant &cookie);
-
     void setCodec(QTextCodec *codec);
 
     void setProgressParser(ProgressParser *parser);
@@ -158,7 +156,7 @@ public:
 signals:
     void stdOutText(const QString &);
     void stdErrText(const QString &);
-    void finished(bool success, const QVariant &cookie);
+    void finished(bool success);
 
     void terminate(); // Internal