diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-07-01 16:22:45 +0300 |
|---|---|---|
| committer | hjk <hjk121@nokiamail.com> | 2013-07-01 15:42:16 +0200 |
| commit | 32217a0c3cf6c469219399771be6485ca3870074 (patch) | |
| tree | 657640dce8cd773a0ef12f06bcd0226200ddaf31 /src | |
| parent | abc6e351b8a151926233b86105ddc200b3bd589d (diff) | |
| download | qt-creator-32217a0c3cf6c469219399771be6485ca3870074.tar.gz | |
Git: Move static strings out of GitClient class
They're only used in gitclient.cpp, define them there
Change-Id: I601f23a6f2a8e533127d2ed068526815e1b9717d
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/git/gitclient.h | 3 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 4ffe6021d6..0f0041026f 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -76,7 +76,8 @@ static const char GIT_DIRECTORY[] = ".git"; static const char graphLogFormatC[] = "%h %d %an %s %ci"; static const char HEAD[] = "HEAD"; - +static const char noColorOption[] = "--no-color"; +static const char decorateOption[] = "--decorate"; namespace Git { namespace Internal { @@ -791,9 +792,6 @@ GitClient::~GitClient() { } -const char *GitClient::noColorOption = "--no-color"; -const char *GitClient::decorateOption = "--decorate"; - QString GitClient::findRepositoryForDirectory(const QString &dir) { if (dir.isEmpty() || dir.endsWith(QLatin1String("/.git")) @@ -1308,7 +1306,7 @@ bool GitClient::synchronousLog(const QString &workingDirectory, const QStringLis QByteArray outputText; QByteArray errorText; QStringList allArguments; - allArguments << QLatin1String("log") << QLatin1String(GitClient::noColorOption); + allArguments << QLatin1String("log") << QLatin1String(noColorOption); allArguments.append(arguments); const bool rc = fullySynchronousGit(workingDirectory, allArguments, &outputText, &errorText); if (rc) { @@ -1786,7 +1784,7 @@ QString GitClient::synchronousShortDescription(const QString &workingDirectory, QByteArray outputTextData; QByteArray errorText; QStringList arguments; - arguments << QLatin1String("log") << QLatin1String(GitClient::noColorOption) + arguments << QLatin1String("log") << QLatin1String(noColorOption) << (QLatin1String("--pretty=format:") + format) << QLatin1String("--max-count=1") << revision; const bool rc = fullySynchronousGit(workingDirectory, arguments, &outputTextData, &errorText); diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 6a9d0f6516..faf3996468 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -313,9 +313,6 @@ public: static QString msgNoChangedFiles(); static QString msgNoCommits(bool includeRemote); - static const char *noColorOption; - static const char *decorateOption; - public slots: void show(const QString &source, const QString &id, const QStringList &args = QStringList(), const QString &name = QString()); |