Git: Remove GitCommand

Use VCSBase::Command instead.

Change-Id: I819e61c2fdf705717709f49ea42ad822d25300fb
Reviewed-on: http://codereview.qt-project.org/6079
Reviewed-by: Tobias Hunger <[email protected]>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 17eb0c657ee..b5335992e1a 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -34,9 +34,9 @@
 #define GITCLIENT_H
 
 #include "gitsettings.h"
-#include "gitcommand.h"
 
 #include <coreplugin/editormanager/ieditor.h>
+#include <vcsbase/command.h>
 
 #include <QtCore/QObject>
 #include <QtCore/QString>
@@ -68,7 +68,6 @@ namespace Internal {
 
 class GitPlugin;
 class GitOutputWindow;
-class GitCommand;
 class CommitData;
 struct GitSubmitEditorPanelData;
 class Stash;
@@ -245,16 +244,16 @@ private:
                                             const QString &dynamicPropertyValue,
                                             QWidget *configWidget) const;
 
-    GitCommand *createCommand(const QString &workingDirectory,
+    VCSBase::Command *createCommand(const QString &workingDirectory,
                              VCSBase::VCSBaseEditorWidget* editor = 0,
                              bool useOutputToWindow = false,
                              int editorLineNumber = -1);
 
-    GitCommand *executeGit(const QString &workingDirectory,
+    VCSBase::Command *executeGit(const QString &workingDirectory,
                            const QStringList &arguments,
                            VCSBase::VCSBaseEditorWidget* editor = 0,
                            bool useOutputToWindow = false,
-                           GitCommand::TerminationReportMode tm = GitCommand::NoReport,
+                           VCSBase::Command::TerminationReportMode tm = VCSBase::Command::NoReport,
                            int editorLineNumber = -1,
                            bool unixTerminalDisabled = false);
 
@@ -279,7 +278,7 @@ private:
                          bool *isDirectory,
                          QString *errorMessage,
                          bool revertStaging);
-    void connectRepositoryChanged(const QString & repository, GitCommand *cmd);
+    void connectRepositoryChanged(const QString & repository, VCSBase::Command *cmd);
     bool synchronousPull(const QString &workingDirectory, bool rebase);
     void syncAbortPullRebase(const QString &workingDir);
     bool tryLauchingGitK(const QProcessEnvironment &env,