From 94148f22e998dd60027ca99878ff2ad80998cb58 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh <orgad.shaneh@audiocodes.com> Date: Wed, 22 May 2013 21:03:37 +0300 Subject: [PATCH] VCS: Remove unused editors Change-Id: Ia931fdd07d7cf1984f34b10c9b4c20a414c93d9e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> --- src/plugins/bazaar/bazaarplugin.cpp | 17 +++++------------ src/plugins/bazaar/constants.h | 5 ----- src/plugins/clearcase/clearcaseplugin.cpp | 7 +------ src/plugins/mercurial/constants.h | 5 ----- src/plugins/mercurial/mercurialplugin.cpp | 8 +------- src/plugins/perforce/perforceconstants.h | 4 ---- src/plugins/perforce/perforceplugin.cpp | 7 +------ src/plugins/subversion/subversionplugin.cpp | 7 +------ 8 files changed, 9 insertions(+), 51 deletions(-) diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 63e450c0b3a..f4a3ebd0b71 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -70,18 +70,11 @@ using namespace Bazaar::Internal; using namespace Bazaar; static const VcsBase::VcsBaseEditorParameters editorParameters[] = { - { - VcsBase::RegularCommandOutput, //type - Constants::COMMANDLOG_ID, // id - Constants::COMMANDLOG_DISPLAY_NAME, // display name - Constants::COMMANDLOG, // context - Constants::COMMANDAPP}, // mime type - - { VcsBase::LogOutput, - Constants::FILELOG_ID, - Constants::FILELOG_DISPLAY_NAME, - Constants::FILELOG, - Constants::LOGAPP}, + { VcsBase::LogOutput, // type + Constants::FILELOG_ID, // id + Constants::FILELOG_DISPLAY_NAME, // display name + Constants::FILELOG, // context + Constants::LOGAPP}, // mime type { VcsBase::AnnotateOutput, Constants::ANNOTATELOG_ID, diff --git a/src/plugins/bazaar/constants.h b/src/plugins/bazaar/constants.h index d60df4af6f0..0699855dc0e 100644 --- a/src/plugins/bazaar/constants.h +++ b/src/plugins/bazaar/constants.h @@ -46,11 +46,6 @@ const char CHANGESET_ID_EXACT[] = "([.0-9]+)"; const char ANNOTATE_CHANGESET_ID[] = "([.0-9]+)"; // Base editor parameters -const char COMMANDLOG_ID[] = "Bazaar Command Log Editor"; -const char COMMANDLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar Command Log Editor"); -const char COMMANDLOG[] = "Bazaar Command Log Editor"; -const char COMMANDAPP[] = "application/vnd.nokia.text.scs_bazaar_commandlog"; - const char FILELOG_ID[] = "Bazaar File Log Editor"; const char FILELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar File Log Editor"); const char FILELOG[] = "Bazaar File Log Editor"; diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 6abdf0196af..526047d1abd 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -121,12 +121,7 @@ static const char CMD_ID_STATUS[] = "ClearCase.Status"; static const VcsBase::VcsBaseEditorParameters editorParameters[] = { { - VcsBase::RegularCommandOutput, - "ClearCase Command Log Editor", // id - QT_TRANSLATE_NOOP("VCS", "ClearCase Command Log Editor"), // display name - "ClearCase Command Log Editor", // context - "application/vnd.audc.text.scs_cc_commandlog"}, -{ VcsBase::LogOutput, + VcsBase::LogOutput, "ClearCase File Log Editor", // id QT_TRANSLATE_NOOP("VCS", "ClearCase File Log Editor"), // display_name "ClearCase File Log Editor", // context diff --git a/src/plugins/mercurial/constants.h b/src/plugins/mercurial/constants.h index c7768c7c4cb..dd476817478 100644 --- a/src/plugins/mercurial/constants.h +++ b/src/plugins/mercurial/constants.h @@ -46,11 +46,6 @@ const char CHANGEIDEXACT40[] = "[a-f0-9]{40,40}"; const char DIFFIDENTIFIER[] = "^(?:diff --git a/|[+-]{3} (?:/dev/null|[ab]/(.+$)))"; // Base editor parameters -const char COMMANDLOG_ID[] = "Mercurial Command Log Editor"; -const char COMMANDLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Mercurial Command Log Editor"); -const char COMMANDLOG[] = "Mercurial Command Log Editor"; -const char COMMANDAPP[] = "application/vnd.nokia.text.scs_mercurial_commandlog"; - const char FILELOG_ID[] = "Mercurial File Log Editor"; const char FILELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Mercurial File Log Editor"); const char FILELOG[] = "Mercurial File Log Editor"; diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 931a9443b49..b651afe55d0 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -75,13 +75,7 @@ using namespace Utils; static const VcsBaseEditorParameters editorParameters[] = { { - RegularCommandOutput, //type - Constants::COMMANDLOG_ID, // id - Constants::COMMANDLOG_DISPLAY_NAME, // display name - Constants::COMMANDLOG, // context - Constants::COMMANDAPP}, // mime type - -{ LogOutput, + LogOutput, Constants::FILELOG_ID, Constants::FILELOG_DISPLAY_NAME, Constants::FILELOG, diff --git a/src/plugins/perforce/perforceconstants.h b/src/plugins/perforce/perforceconstants.h index 259b4afc44d..a34410e8fb7 100644 --- a/src/plugins/perforce/perforceconstants.h +++ b/src/plugins/perforce/perforceconstants.h @@ -39,10 +39,6 @@ const char PERFORCE_SUBMIT_EDITOR_ID[] = "Perforce.SubmitEditor"; const char PERFORCE_SUBMIT_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Perforce.SubmitEditor"); const char PERFORCESUBMITEDITOR_CONTEXT[] = "Perforce Submit Editor"; -const char PERFORCE_COMMANDLOG_EDITOR_ID[] = "Perfoirce.CommandLogEditor"; -const char PERFORCE_COMMANDLOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Perforce CommandLog Editor"); -const char PERFORCE_COMMANDLOG_EDITOR_CONTEXT[] = "Perforce Command Log Editor"; - const char PERFORCE_LOG_EDITOR_ID[] = "Perforce.LogEditor"; const char PERFORCE_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Perforce Log Editor"); const char PERFORCE_LOG_EDITOR_CONTEXT[] = "Perforce Log Editor"; diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index 137eea82881..f83b30143f4 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -74,12 +74,7 @@ static const VcsBase::VcsBaseEditorParameters editorParameters[] = { { - VcsBase::RegularCommandOutput, - Perforce::Constants::PERFORCE_COMMANDLOG_EDITOR_ID, - Perforce::Constants::PERFORCE_COMMANDLOG_EDITOR_DISPLAY_NAME, - Perforce::Constants::PERFORCE_COMMANDLOG_EDITOR_CONTEXT, - "application/vnd.nokia.text.scs_commandlog"}, -{ VcsBase::LogOutput, + VcsBase::LogOutput, Perforce::Constants::PERFORCE_LOG_EDITOR_ID, Perforce::Constants::PERFORCE_LOG_EDITOR_DISPLAY_NAME, Perforce::Constants::PERFORCE_LOG_EDITOR_CONTEXT, diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index e2f0a15f48b..b49a9d31548 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -112,12 +112,7 @@ static const char nonInteractiveOptionC[] = "--non-interactive"; static const VcsBase::VcsBaseEditorParameters editorParameters[] = { { - VcsBase::RegularCommandOutput, - "Subversion Command Log Editor", // id - QT_TRANSLATE_NOOP("VCS", "Subversion Command Log Editor"), // display name - "Subversion Command Log Editor", // context - "application/vnd.nokia.text.scs_svn_commandlog"}, -{ VcsBase::LogOutput, + VcsBase::LogOutput, "Subversion File Log Editor", // id QT_TRANSLATE_NOOP("VCS", "Subversion File Log Editor"), // display_name "Subversion File Log Editor", // context -- GitLab