diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-05-21 20:54:26 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2013-05-24 12:21:26 +0200 |
commit | fd48f081c60675a101080fcd296916986eac242c (patch) | |
tree | 5f3f9ee291ea49db3bdc0747eafb4659d26b20e6 /src/plugins | |
parent | a439d12b4877f1e53c6d30f8d700f90d4ed73df0 (diff) | |
download | qt-creator-fd48f081c60675a101080fcd296916986eac242c.tar.gz |
VCS: Remove unused extension parameter from editors
Change-Id: I17e73e269698af0d515f668d3c272a748cdca3bb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/bazaar/bazaarplugin.cpp | 12 | ||||
-rw-r--r-- | src/plugins/bazaar/constants.h | 4 | ||||
-rw-r--r-- | src/plugins/clearcase/clearcaseplugin.cpp | 11 | ||||
-rw-r--r-- | src/plugins/cvs/cvsplugin.cpp | 11 | ||||
-rw-r--r-- | src/plugins/git/gitplugin.cpp | 11 | ||||
-rw-r--r-- | src/plugins/mercurial/constants.h | 4 | ||||
-rw-r--r-- | src/plugins/mercurial/mercurialplugin.cpp | 12 | ||||
-rw-r--r-- | src/plugins/perforce/perforceplugin.cpp | 11 | ||||
-rw-r--r-- | src/plugins/subversion/subversionplugin.cpp | 11 | ||||
-rw-r--r-- | src/plugins/vcsbase/vcsbaseeditor.h | 1 |
10 files changed, 28 insertions, 60 deletions
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index f008dcbcf2..63e450c0b3 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -75,29 +75,25 @@ static const VcsBase::VcsBaseEditorParameters editorParameters[] = { Constants::COMMANDLOG_ID, // id Constants::COMMANDLOG_DISPLAY_NAME, // display name Constants::COMMANDLOG, // context - Constants::COMMANDAPP, // mime type - Constants::COMMANDEXT}, //extension + Constants::COMMANDAPP}, // mime type { VcsBase::LogOutput, Constants::FILELOG_ID, Constants::FILELOG_DISPLAY_NAME, Constants::FILELOG, - Constants::LOGAPP, - Constants::LOGEXT}, + Constants::LOGAPP}, { VcsBase::AnnotateOutput, Constants::ANNOTATELOG_ID, Constants::ANNOTATELOG_DISPLAY_NAME, Constants::ANNOTATELOG, - Constants::ANNOTATEAPP, - Constants::ANNOTATEEXT}, + Constants::ANNOTATEAPP}, { VcsBase::DiffOutput, Constants::DIFFLOG_ID, Constants::DIFFLOG_DISPLAY_NAME, Constants::DIFFLOG, - Constants::DIFFAPP, - Constants::DIFFEXT} + Constants::DIFFAPP} }; static const VcsBase::VcsBaseSubmitEditorParameters submitEditorParameters = { diff --git a/src/plugins/bazaar/constants.h b/src/plugins/bazaar/constants.h index a155656786..d60df4af6f 100644 --- a/src/plugins/bazaar/constants.h +++ b/src/plugins/bazaar/constants.h @@ -50,25 +50,21 @@ 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 COMMANDEXT[] = "vcsBazaarCommand"; 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"; const char LOGAPP[] = "application/vnd.nokia.text.scs_bazaar_log"; -const char LOGEXT[] = "vcsBazaarLog"; const char ANNOTATELOG_ID[] = "Bazaar Annotation Editor"; const char ANNOTATELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar Annotation Editor"); const char ANNOTATELOG[] = "Bazaar Annotation Editor"; const char ANNOTATEAPP[] = "application/vnd.nokia.text.scs_bazaar_annotatelog"; -const char ANNOTATEEXT[] = "vcsBazaarAnnotate"; const char DIFFLOG_ID[] = "Bazaar Diff Editor"; const char DIFFLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Bazaar Diff Editor"); const char DIFFLOG[] = "Bazaar Diff Editor"; const char DIFFAPP[] = "text/x-patch"; -const char DIFFEXT[] = "diff"; // Submit editor parameters const char COMMIT_ID[] = "Bazaar Commit Log Editor"; diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 8b77740154..6abdf0196a 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -125,25 +125,22 @@ static const VcsBase::VcsBaseEditorParameters editorParameters[] = { "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", - "scslog"}, + "application/vnd.audc.text.scs_cc_commandlog"}, { VcsBase::LogOutput, "ClearCase File Log Editor", // id QT_TRANSLATE_NOOP("VCS", "ClearCase File Log Editor"), // display_name "ClearCase File Log Editor", // context - "application/vnd.audc.text.scs_cc_filelog", - "scsfilelog"}, + "application/vnd.audc.text.scs_cc_filelog"}, { VcsBase::AnnotateOutput, "ClearCase Annotation Editor", // id QT_TRANSLATE_NOOP("VCS", "ClearCase Annotation Editor"), // display_name "ClearCase Annotation Editor", // context - "application/vnd.audc.text.scs_cc_annotation", - "scsannotate"}, + "application/vnd.audc.text.scs_cc_annotation"}, { VcsBase::DiffOutput, "ClearCase Diff Editor", // id QT_TRANSLATE_NOOP("VCS", "ClearCase Diff Editor"), // display_name "ClearCase Diff Editor", // context - "text/x-patch","diff"} + "text/x-patch"} }; // Utility to find a parameter set by type diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index e2caf4abf3..ec809a1ded 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -120,25 +120,22 @@ static const VcsBaseEditorParameters editorParameters[] = { "CVS Command Log Editor", // id QT_TRANSLATE_NOOP("VCS", "CVS Command Log Editor"), // display name "CVS Command Log Editor", // context - "application/vnd.nokia.text.scs_cvs_commandlog", - "scslog"}, + "application/vnd.nokia.text.scs_cvs_commandlog"}, { LogOutput, "CVS File Log Editor", // id QT_TRANSLATE_NOOP("VCS", "CVS File Log Editor"), // display name "CVS File Log Editor", // context - "application/vnd.nokia.text.scs_cvs_filelog", - "scsfilelog"}, + "application/vnd.nokia.text.scs_cvs_filelog"}, { AnnotateOutput, "CVS Annotation Editor", // id QT_TRANSLATE_NOOP("VCS", "CVS Annotation Editor"), // display name "CVS Annotation Editor", // context - "application/vnd.nokia.text.scs_cvs_annotation", - "scsannotate"}, + "application/vnd.nokia.text.scs_cvs_annotation"}, { DiffOutput, "CVS Diff Editor", // id QT_TRANSLATE_NOOP("VCS", "CVS Diff Editor"), // display name "CVS Diff Editor", // context - "text/x-patch","diff"} + "text/x-patch"} }; // Utility to find a parameter set by type diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 92216c6ac8..5b3fe507c0 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -88,25 +88,22 @@ static const VcsBase::VcsBaseEditorParameters editorParameters[] = { Git::Constants::GIT_COMMAND_LOG_EDITOR_ID, Git::Constants::GIT_COMMAND_LOG_EDITOR_DISPLAY_NAME, Git::Constants::C_GIT_COMMAND_LOG_EDITOR, - "application/vnd.nokia.text.scs_git_commandlog", - "gitlog"}, + "application/vnd.nokia.text.scs_git_commandlog"}, { VcsBase::LogOutput, Git::Constants::GIT_LOG_EDITOR_ID, Git::Constants::GIT_LOG_EDITOR_DISPLAY_NAME, Git::Constants::C_GIT_LOG_EDITOR, - "application/vnd.nokia.text.scs_git_filelog", - "gitfilelog"}, + "application/vnd.nokia.text.scs_git_filelog"}, { VcsBase::AnnotateOutput, Git::Constants::GIT_BLAME_EDITOR_ID, Git::Constants::GIT_BLAME_EDITOR_DISPLAY_NAME, Git::Constants::C_GIT_BLAME_EDITOR, - "application/vnd.nokia.text.scs_git_annotation", - "gitsannotate"}, + "application/vnd.nokia.text.scs_git_annotation"}, { VcsBase::DiffOutput, Git::Constants::GIT_DIFF_EDITOR_ID, Git::Constants::GIT_DIFF_EDITOR_DISPLAY_NAME, Git::Constants::C_GIT_DIFF_EDITOR, - "text/x-patch","diff"} + "text/x-patch"} }; // Utility to find a parameter set by type diff --git a/src/plugins/mercurial/constants.h b/src/plugins/mercurial/constants.h index 060cdc39c1..c7768c7c4c 100644 --- a/src/plugins/mercurial/constants.h +++ b/src/plugins/mercurial/constants.h @@ -50,25 +50,21 @@ 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 COMMANDEXT[] = "vcsMercurialCommand"; 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"; const char LOGAPP[] = "application/vnd.nokia.text.scs_mercurial_log"; -const char LOGEXT[] = "vcsMercurialLog"; const char ANNOTATELOG_ID[] = "Mercurial Annotation Editor"; const char ANNOTATELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Mercurial Annotation Editor"); const char ANNOTATELOG[] = "Mercurial Annotation Editor"; const char ANNOTATEAPP[] = "application/vnd.nokia.text.scs_mercurial_annotatelog"; -const char ANNOTATEEXT[] = "vcsMercurialAnnotate"; const char DIFFLOG_ID[] = "Mercurial Diff Editor"; const char DIFFLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Mercurial Diff Editor"); const char DIFFLOG[] = "Mercurial Diff Editor"; const char DIFFAPP[] = "text/x-patch"; -const char DIFFEXT[] = "diff"; // Submit editor parameters const char COMMIT_ID[] = "Mercurial Commit Log Editor"; diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 02f28bdcdc..931a9443b4 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -79,29 +79,25 @@ static const VcsBaseEditorParameters editorParameters[] = { Constants::COMMANDLOG_ID, // id Constants::COMMANDLOG_DISPLAY_NAME, // display name Constants::COMMANDLOG, // context - Constants::COMMANDAPP, // mime type - Constants::COMMANDEXT}, //extension + Constants::COMMANDAPP}, // mime type { LogOutput, Constants::FILELOG_ID, Constants::FILELOG_DISPLAY_NAME, Constants::FILELOG, - Constants::LOGAPP, - Constants::LOGEXT}, + Constants::LOGAPP}, { AnnotateOutput, Constants::ANNOTATELOG_ID, Constants::ANNOTATELOG_DISPLAY_NAME, Constants::ANNOTATELOG, - Constants::ANNOTATEAPP, - Constants::ANNOTATEEXT}, + Constants::ANNOTATEAPP}, { DiffOutput, Constants::DIFFLOG_ID, Constants::DIFFLOG_DISPLAY_NAME, Constants::DIFFLOG, - Constants::DIFFAPP, - Constants::DIFFEXT} + Constants::DIFFAPP} }; static const VcsBaseSubmitEditorParameters submitEditorParameters = { diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index 1ef1cf5f32..137eea8288 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -78,25 +78,22 @@ static const VcsBase::VcsBaseEditorParameters editorParameters[] = { 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", - "scslog"}, + "application/vnd.nokia.text.scs_commandlog"}, { VcsBase::LogOutput, Perforce::Constants::PERFORCE_LOG_EDITOR_ID, Perforce::Constants::PERFORCE_LOG_EDITOR_DISPLAY_NAME, Perforce::Constants::PERFORCE_LOG_EDITOR_CONTEXT, - "application/vnd.nokia.text.scs_filelog", - "scsfilelog"}, + "application/vnd.nokia.text.scs_filelog"}, { VcsBase::AnnotateOutput, Perforce::Constants::PERFORCE_ANNOTATION_EDITOR_ID, Perforce::Constants::PERFORCE_ANNOTATION_EDITOR_DISPLAY_NAME, Perforce::Constants::PERFORCE_ANNOTATION_EDITOR_CONTEXT, - "application/vnd.nokia.text.scs_annotation", - "scsannotate"}, + "application/vnd.nokia.text.scs_annotation"}, { VcsBase::DiffOutput, Perforce::Constants::PERFORCE_DIFF_EDITOR_ID, Perforce::Constants::PERFORCE_DIFF_EDITOR_DISPLAY_NAME, Perforce::Constants::PERFORCE_DIFF_EDITOR_CONTEXT, - "text/x-patch","diff"} + "text/x-patch"} }; // Utility to find a parameter set by type diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 76d5594040..e2f0a15f48 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -116,25 +116,22 @@ static const VcsBase::VcsBaseEditorParameters editorParameters[] = { "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", - "scslog"}, + "application/vnd.nokia.text.scs_svn_commandlog"}, { VcsBase::LogOutput, "Subversion File Log Editor", // id QT_TRANSLATE_NOOP("VCS", "Subversion File Log Editor"), // display_name "Subversion File Log Editor", // context - "application/vnd.nokia.text.scs_svn_filelog", - "scsfilelog"}, + "application/vnd.nokia.text.scs_svn_filelog"}, { VcsBase::AnnotateOutput, "Subversion Annotation Editor", // id QT_TRANSLATE_NOOP("VCS", "Subversion Annotation Editor"), // display_name "Subversion Annotation Editor", // context - "application/vnd.nokia.text.scs_svn_annotation", - "scsannotate"}, + "application/vnd.nokia.text.scs_svn_annotation"}, { VcsBase::DiffOutput, "Subversion Diff Editor", // id QT_TRANSLATE_NOOP("VCS", "Subversion Diff Editor"), // display_name "Subversion Diff Editor", // context - "text/x-patch","diff"} + "text/x-patch"} }; // Utility to find a parameter set by type diff --git a/src/plugins/vcsbase/vcsbaseeditor.h b/src/plugins/vcsbase/vcsbaseeditor.h index da1eb96482..73af1354df 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.h +++ b/src/plugins/vcsbase/vcsbaseeditor.h @@ -72,7 +72,6 @@ public: const char *displayName; const char *context; const char *mimeType; - const char *extension; }; class VCSBASE_EXPORT DiffChunk |