Vcs: Move annotate and annotateRevisionRequested into VcsBaseClientImpl

... and use that in the Git client.

Change-Id: Ie70ec0d5908776d11eb69613d45f565d4f0ce32b
Reviewed-by: Orgad Shaneh <[email protected]>
Reviewed-by: Tobias Hunger <[email protected]>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 8a2bb35bf91..59d11ff5c6d 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -162,8 +162,9 @@ public:
     void log(const QString &workingDirectory, const QString &fileName = QString(),
              bool enableAnnotationContextMenu = false, const QStringList &args = QStringList());
     void reflog(const QString &workingDirectory);
-    void blame(const QString &workingDirectory, const QStringList &args, const QString &fileName,
-               const QString &revision = QString(), int lineNumber = -1);
+    void annotate(const QString &workingDir, const QString &file,
+                  const QString &revision = QString(), int lineNumber = -1,
+                  const QStringList &extraOptions = QStringList()) override;
     void reset(const QString &workingDirectory, const QString &argument, const QString &commit = QString());
     void addFile(const QString &workingDirectory, const QString &fileName);
     bool synchronousLog(const QString &workingDirectory,
@@ -357,9 +358,6 @@ private slots:
     void branchesForCommit(const QString &revision);
 
 private:
-    void annotateRevisionRequested(const QString &workingDirectory, const QString &file,
-                                   const QString &change, int lineNumber) override;
-
     void stage(const QString &patch, bool revert);
     VcsBase::VcsBaseEditorWidget *findExistingVCSEditor(const char *registerDynamicProperty,
                                                         const QString &dynamicPropertyValue) const;