diff options
author | Orgad Shaneh <[email protected]> | 2013-07-17 22:24:13 +0300 |
---|---|---|
committer | Orgad Shaneh <[email protected]> | 2013-07-19 13:56:34 +0200 |
commit | 0c50c5a1d31a58b66aceabb07adf940097b220f1 (patch) | |
tree | b6d868874f852134a3a33d433fdcee51de5f9783 /src/plugins/git/gitclient.h | |
parent | a1e9b81cecede8b634ccead4f71a3071250f5171 (diff) |
VCS: Consolidate codec handling
Change-Id: I2c9a5031b63f0bc3e884739be680d051d7cf1ab4
Reviewed-by: Friedemann Kleint <[email protected]>
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.h')
-rw-r--r-- | src/plugins/git/gitclient.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 79974b07c41..5f06131eaaa 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -234,7 +234,7 @@ public: QString synchronousTopic(const QString &workingDirectory); QString synchronousTopRevision(const QString &workingDirectory, QString *errorMessage = 0); void synchronousTagsForCommit(const QString &workingDirectory, const QString &revision, - QByteArray &precedes, QByteArray &follows); + QString &precedes, QString &follows); bool isRemoteCommit(const QString &workingDirectory, const QString &commit); bool cloneRepository(const QString &directory, const QByteArray &url); @@ -327,8 +327,8 @@ public slots: private slots: void slotBlameRevisionRequested(const QString &source, QString change, int lineNumber); - void appendOutputData(const QByteArray &data) const; - void appendOutputDataSilently(const QByteArray &data) const; + void appendOutputData(const QString &data) const; + void appendOutputDataSilently(const QString &data) const; void finishSubmoduleUpdate(); void fetchFinished(const QVariant &cookie); |