summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitclient.h
diff options
context:
space:
mode:
authorYuchen Deng <loaden@gmail.com>2011-10-21 09:30:56 +0000
committerTobias Hunger <tobias.hunger@nokia.com>2011-10-21 11:42:49 +0200
commitc7d712e8d34e0de2916b472fcf39c945a522e5b7 (patch)
tree4e7433658e2f14741727c3ae51189290451cff93 /src/plugins/git/gitclient.h
parent08f97b50d71a2b16b76659b82062a3d438195990 (diff)
downloadqt-creator-c7d712e8d34e0de2916b472fcf39c945a522e5b7.tar.gz
Git: Add support for the i18n.logoutputencoding setting
Change-Id: I99df9765da1ba68c449f8879c8262c3ca3fbc28c Merge-request: 382 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/git/gitclient.h')
-rw-r--r--src/plugins/git/gitclient.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index f13973ff36..f4520e215a 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -187,9 +187,9 @@ public:
const QString &messge, QString *name,
QString *errorMessage = 0);
- QString readConfig(const QString &workingDirectory, const QStringList &configVar);
+ QString readConfig(const QString &workingDirectory, const QStringList &configVar) const;
- QString readConfigValue(const QString &workingDirectory, const QString &configVar);
+ QString readConfigValue(const QString &workingDirectory, const QString &configVar) const;
enum StashResult { StashUnchanged, StashCanceled, StashFailed,
Stashed, NotStashed /* User did not want it */ };
@@ -237,10 +237,11 @@ private slots:
private:
VCSBase::VCSBaseEditorWidget *findExistingVCSEditor(const char *registerDynamicProperty,
const QString &dynamicPropertyValue) const;
+ enum CodecType { CodecSource, CodecLogOutput, CodecNone };
VCSBase::VCSBaseEditorWidget *createVCSEditor(const QString &kind,
QString title,
const QString &source,
- bool setSourceCodec,
+ CodecType codecType,
const char *registerDynamicProperty,
const QString &dynamicPropertyValue,
QWidget *configWidget) const;