feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Remove GitCommand

Browse Source 
Use VCSBase::Command instead.

Change-Id: I819e61c2fdf705717709f49ea42ad822d25300fb
Reviewed-on: http://codereview.qt-project.org/6079
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2011-10-05 14:32:30 +00:00
parent 6a72edb28a
commit ddf01f357b
5 changed files with 28 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/git/gitclient.h
View File

@@ -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,