diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-04-10 14:52:30 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-04-10 14:14:47 +0000 |
| commit | 0f5fdbe0f2b25256a682fcc0d003d3ecac2e697c (patch) | |
| tree | e156d90ddb64ad5c0bd95bace0c315e1a0e277b6 /src/plugins/git | |
| parent | 68045c1d0d3c8e4fc2310db5b0fe63b8ed4c486e (diff) | |
| download | qt-creator-0f5fdbe0f2b25256a682fcc0d003d3ecac2e697c.tar.gz | |
Git: WS fix
Change-Id: I0b4d37ae8ccd5f5edd8f049d31519be7d2131036
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 13 | ||||
| -rw-r--r-- | src/plugins/git/gitclient.h | 14 |
2 files changed, 11 insertions, 16 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 4a2889d9f0..9eb15e7990 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1968,12 +1968,9 @@ bool GitClient::synchronousApplyPatch(const QString &workingDirectory, } // Execute a single command -VcsCommand *GitClient::executeGit(const QString &workingDirectory, - const QStringList &arguments, - VcsBaseEditorWidget* editor, - bool useOutputToWindow, - unsigned additionalFlags, - int editorLineNumber) +VcsCommand *GitClient::executeGit(const QString &workingDirectory, const QStringList &arguments, + VcsBaseEditorWidget *editor, bool useOutputToWindow, + unsigned additionalFlags, int editorLineNumber) { VcsOutputWindow::appendCommand(workingDirectory, vcsBinary(), arguments); VcsCommand *command = createCommand(workingDirectory, editor, @@ -2048,8 +2045,8 @@ SynchronousProcessResponse GitClient::synchronousGit(const QString &workingDirec bool GitClient::fullySynchronousGit(const QString &workingDirectory, const QStringList &gitArguments, - QByteArray* outputText, - QByteArray* errorText, + QByteArray *outputText, + QByteArray *errorText, unsigned flags) const { VcsCommand command(vcsBinary(), workingDirectory, processEnvironment()); diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 06eb460404..9ebdf23b85 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -376,18 +376,16 @@ private: void requestReload(const QString &documentId, const QString &source, const QString &title, std::function<DiffEditor::DiffEditorController *(Core::IDocument *)> factory) const; - VcsBase::VcsCommand *executeGit(const QString &workingDirectory, - const QStringList &arguments, - VcsBase::VcsBaseEditorWidget* editor = 0, - bool useOutputToWindow = false, - unsigned additionalFlags = 0, - int editorLineNumber = -1); + VcsBase::VcsCommand *executeGit(const QString &workingDirectory, const QStringList &arguments, + VcsBase::VcsBaseEditorWidget *editor = 0, + bool useOutputToWindow = false, unsigned additionalFlags = 0, + int editorLineNumber = -1); // Fully synchronous git execution (QProcess-based). bool fullySynchronousGit(const QString &workingDirectory, const QStringList &arguments, - QByteArray* outputText, - QByteArray* errorText = 0, + QByteArray *outputText, + QByteArray *errorText = 0, unsigned flags = 0) const; // Synchronous git execution using Utils::SynchronousProcess, with |