Commit a3ebfae1 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Fix build



Change-Id: Ie17ac67829d647572f52f51d0a5aea6f3622bbc8
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 7b166ccc
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment