diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2013-01-23 15:39:26 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2013-01-23 15:40:44 +0100 |
commit | a3ebfae11db8090b3272f69d9d4e642f786fda3a (patch) | |
tree | a7acdc5483bbd5c83a5d8a29177fc4d754b71c01 | |
parent | 7b166ccc09e1d278da287fdaa435ac0b771e63d8 (diff) | |
download | qt-creator-a3ebfae11db8090b3272f69d9d4e642f786fda3a.tar.gz |
Fix build
Change-Id: Ie17ac67829d647572f52f51d0a5aea6f3622bbc8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
-rw-r--r-- | src/plugins/git/gitclient.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index ffe354ff29..9b002c683b 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -212,7 +212,8 @@ public: enum StashResult { StashUnchanged, StashCanceled, StashFailed, Stashed, NotStashed /* User did not want it */ }; StashResult ensureStash(const QString &workingDirectory, const QString &keyword, QString *message = 0); - StashResult ensureStash(const QString &workingDirectory, const QString &keyword, QString *message, QString *errorMessage); + StashResult ensureStash(const QString &workingDirectory, const QString &keyword, bool askUser, + QString *message, QString *errorMessage = 0); bool getCommitData(const QString &workingDirectory, bool amend, QString *commitTemplate, CommitData *commitData, @@ -243,9 +244,6 @@ public: bool isValidRevision(const QString &revision) const; - StashResult ensureStash(const QString &workingDirectory, const QString &keyword, bool askUser, - QString *message, QString *errorMessage = 0); - static QString msgNoChangedFiles(); static const char *noColorOption; |