diff --git a/src/plugins/clearcase/clearcasesettings.cpp b/src/plugins/clearcase/clearcasesettings.cpp index bafaa02f5b0ada1e0f32b78f2637482a0853b8d5..019b733723378388f72a026537ecec691343a9f6 100644 --- a/src/plugins/clearcase/clearcasesettings.cpp +++ b/src/plugins/clearcase/clearcasesettings.cpp @@ -42,7 +42,6 @@ static const char historyCountKeyC[] = "HistoryCount"; static const char timeOutKeyC[] = "TimeOut"; static const char autoCheckOutKeyC[] = "AutoCheckOut"; static const char diffTypeKeyC[] = "DiffType"; -static const char extDiffCommandKeyC[] = "ExternalDiffCommand"; static const char diffArgsKeyC[] = "DiffArgs"; static const char autoAssignActivityKeyC[] = "AutoAssignActivityName"; static const char promptToCheckInKeyC[] = "PromptToCheckIn"; diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 0195750da314322f0c58bbf64a02c8a7bb4de408..75423545226d48c9da3fe09e537cf4cee8b7d4ec 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1884,11 +1884,6 @@ QString GitClient::synchronousCurrentLocalBranch(const QString &workingDirectory return QString(); } -static inline QString msgCannotDetermineBranch(const QString &workingDirectory, const QString &why) -{ - return GitClient::tr("Cannot retrieve branch of \"%1\": %2").arg(QDir::toNativeSeparators(workingDirectory), why); -} - static inline QString msgCannotRun(const QString &command, const QString &workingDirectory, const QString &why) { return GitClient::tr("Cannot run \"%1\" in \"%2\": %3") @@ -2640,21 +2635,6 @@ void GitClient::fetchFinished(const QVariant &cookie) GitPlugin::instance()->updateBranches(cookie.toString()); } -// Trim a git status file spec: "modified: foo .cpp" -> "modified: foo .cpp" -static inline QString trimFileSpecification(QString fileSpec) -{ - const int colonIndex = fileSpec.indexOf(QLatin1Char(':')); - if (colonIndex != -1) { - // Collapse the sequence of spaces - const int filePos = colonIndex + 2; - int nonBlankPos = filePos; - for ( ; fileSpec.at(nonBlankPos).isSpace(); nonBlankPos++) ; - if (nonBlankPos > filePos) - fileSpec.remove(filePos, nonBlankPos - filePos); - } - return fileSpec; -} - GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, StatusMode mode, QString *output, QString *errorMessage) { diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index aea7c94654ed3f05f08ec16bf48502d099870c3f..eae49651a82f11685119c263ac9313cd59b6c47f 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -139,7 +139,6 @@ static const char CMD_ID_UPDATE_PROJECT[] = "Perforce.UpdateProject"; static const char CMD_ID_REVERT_PROJECT[] = "Perforce.RevertProject"; static const char CMD_ID_REVERT_UNCHANGED_PROJECT[] = "Perforce.RevertUnchangedProject"; static const char CMD_ID_DIFF_ALL[] = "Perforce.DiffAll"; -static const char CMD_ID_RESOLVE[] = "Perforce.Resolve"; static const char CMD_ID_SUBMIT[] = "Perforce.Submit"; static const char CMD_ID_PENDING_CHANGES[] = "Perforce.PendingChanges"; static const char CMD_ID_DESCRIBE[] = "Perforce.Describe"; diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index d7dade6679a3892adf03e6d8e8e8818aeac33504..44b680a6e4e99af40d26bf1d81c7b6ddcdb5b6e6 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -93,7 +93,6 @@ static const char CMD_ID_DIFF_CURRENT[] = "Subversion.DiffCurrent"; static const char CMD_ID_COMMIT_ALL[] = "Subversion.CommitAll"; static const char CMD_ID_REVERT_ALL[] = "Subversion.RevertAll"; static const char CMD_ID_COMMIT_CURRENT[] = "Subversion.CommitCurrent"; -static const char CMD_ID_SEPARATOR2[] = "Subversion.Separator2"; static const char CMD_ID_FILELOG_CURRENT[] = "Subversion.FilelogCurrent"; static const char CMD_ID_ANNOTATE_CURRENT[] = "Subversion.AnnotateCurrent"; static const char CMD_ID_STATUS[] = "Subversion.Status";