Editors: Automatically add editor/document id to context and use that

instead of manually adding a context everywhere.

Change-Id: I4336015a6d19349171a255e949da89b0013d6700
Reviewed-by: hjk <hjk121@nokiamail.com>

3 files changed, 3 insertions, 10 deletions

diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp
index 6a9ff8e956..18d584daf1 100644
--- a/src/plugins/bazaar/bazaarclient.cpp
+++ b/src/plugins/bazaar/bazaarclient.cpp
@@ -170,11 +170,11 @@ Core::Id BazaarClient::vcsEditorKind(VcsCommandTag cmd) const
 {
     switch (cmd) {
     case AnnotateCommand:
-        return Constants::ANNOTATELOG;
+        return Constants::ANNOTATELOG_ID;
     case DiffCommand:
-        return Constants::DIFFLOG;
+        return Constants::DIFFLOG_ID;
     case LogCommand:
-        return Constants::FILELOG;
+        return Constants::FILELOG_ID;
     default:
         return Core::Id();
     }
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 7788667248..3aac3ab6ef 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -115,19 +115,16 @@ const VcsBaseEditorParameters editorParameters[] = {
     {   LogOutput, // type
         Constants::FILELOG_ID, // id
         Constants::FILELOG_DISPLAY_NAME, // display name
-        Constants::FILELOG, // context
         Constants::LOGAPP}, // mime type
 
     {    AnnotateOutput,
          Constants::ANNOTATELOG_ID,
          Constants::ANNOTATELOG_DISPLAY_NAME,
-         Constants::ANNOTATELOG,
          Constants::ANNOTATEAPP},
 
     {   DiffOutput,
         Constants::DIFFLOG_ID,
         Constants::DIFFLOG_DISPLAY_NAME,
-        Constants::DIFFLOG,
         Constants::DIFFAPP}
 };
 
@@ -135,7 +132,6 @@ const VcsBaseSubmitEditorParameters submitEditorParameters = {
     COMMITMIMETYPE,
     COMMIT_ID,
     COMMIT_DISPLAY_NAME,
-    COMMIT_ID,
     VcsBaseSubmitEditorParameters::DiffFiles
 };
 
diff --git a/src/plugins/bazaar/constants.h b/src/plugins/bazaar/constants.h
index 054c9909b7..3d6402fcb7 100644
--- a/src/plugins/bazaar/constants.h
+++ b/src/plugins/bazaar/constants.h
@@ -48,17 +48,14 @@ const char ANNOTATE_CHANGESET_ID[] = "([.0-9]+)";
 // Base editor parameters
 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[] = "text/vnd.qtcreator.bazaar.log";
 
 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[] = "text/vnd.qtcreator.bazaar.annotation";
 
 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";
 
 } // namespace Constants