Core: Make IEditor::id a value member and adjust users

Change-Id: I47e457c4a1821c515cd8a740d27bfe005a0c09e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

39 files changed, 44 insertions, 114 deletions

diff --git a/src/plugins/android/androidmanifesteditor.cpp b/src/plugins/android/androidmanifesteditor.cpp
index cb92493712..09b546bc12 100644
--- a/src/plugins/android/androidmanifesteditor.cpp
+++ b/src/plugins/android/androidmanifesteditor.cpp
@@ -44,6 +44,8 @@ using namespace Internal;
 Android::Internal::AndroidManifestEditor::AndroidManifestEditor(AndroidManifestEditorWidget *editorWidget)
     : Core::IEditor(editorWidget), m_toolBar(0)
 {
+    setId(Constants::ANDROID_MANIFEST_EDITOR_ID);
+
     m_toolBar = new QToolBar(editorWidget);
     m_actionGroup = new QActionGroup(this);
     connect(m_actionGroup, SIGNAL(triggered(QAction*)), this, SLOT(changeEditorPage(QAction*)));
@@ -64,11 +66,6 @@ Android::Internal::AndroidManifestEditor::AndroidManifestEditor(AndroidManifestE
     setWidget(editorWidget);
 }
 
-Core::Id AndroidManifestEditor::id() const
-{
-    return Constants::ANDROID_MANIFEST_EDITOR_ID;
-}
-
 bool AndroidManifestEditor::open(QString *errorString, const QString &fileName, const QString &realFileName)
 {
     return widget()->open(errorString, fileName, realFileName);
diff --git a/src/plugins/android/androidmanifesteditor.h b/src/plugins/android/androidmanifesteditor.h
index aedd29c57c..f8851972cd 100644
--- a/src/plugins/android/androidmanifesteditor.h
+++ b/src/plugins/android/androidmanifesteditor.h
@@ -50,7 +50,6 @@ class AndroidManifestEditor : public Core::IEditor
 public:
     explicit AndroidManifestEditor(AndroidManifestEditorWidget *editorWidget);
 
-    Core::Id id() const;
     bool open(QString *errorString, const QString &fileName, const QString &realFileName);
     QWidget *toolBar();
     AndroidManifestEditorWidget *widget() const;
diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp
index c4c922873a..219b55f0dd 100644
--- a/src/plugins/android/javaeditor.cpp
+++ b/src/plugins/android/javaeditor.cpp
@@ -52,6 +52,7 @@ using namespace Android::Internal;
 JavaEditor::JavaEditor(JavaEditorWidget *editor)
   : BaseTextEditor(editor)
 {
+    setId(Constants::JAVA_EDITOR_ID);
     setContext(Core::Context(Constants::C_JAVA_EDITOR,
               TextEditor::Constants::C_TEXTEDITOR));
 }
@@ -64,11 +65,6 @@ Core::IEditor *JavaEditor::duplicate()
     return ret->editor();
 }
 
-Core::Id JavaEditor::id() const
-{
-    return Core::Id(Constants::JAVA_EDITOR_ID);
-}
-
 TextEditor::CompletionAssistProvider *JavaEditor::completionAssistProvider()
 {
     return ExtensionSystem::PluginManager::getObject<JavaCompletionAssistProvider>();
diff --git a/src/plugins/android/javaeditor.h b/src/plugins/android/javaeditor.h
index 369136858d..577b00f886 100644
--- a/src/plugins/android/javaeditor.h
+++ b/src/plugins/android/javaeditor.h
@@ -49,7 +49,6 @@ public:
 
     bool duplicateSupported() const { return true; }
     Core::IEditor *duplicate();
-    Core::Id id() const;
     TextEditor::CompletionAssistProvider *completionAssistProvider();
 };
 
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 47d7f64413..910764d913 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -340,6 +340,7 @@ class BinEditor : public Core::IEditor
 public:
     BinEditor(BinEditorWidget *widget)
     {
+        setId(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID);
         setWidget(widget);
         m_widget = widget;
         m_file = new BinEditorDocument(m_widget);
@@ -380,7 +381,6 @@ public:
         return m_file->open(errorString, fileName);
     }
     Core::IDocument *document() { return m_file; }
-    Core::Id id() const { return Core::Id(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID); }
 
     QWidget *toolBar() { return m_toolBar; }
 
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
index 8f27c12c27..0c8b863b64 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
@@ -59,6 +59,7 @@ using namespace CMakeProjectManager::Internal;
 CMakeEditor::CMakeEditor(CMakeEditorWidget *editor)
   : BaseTextEditor(editor)
 {
+    setId(CMakeProjectManager::Constants::CMAKE_EDITOR_ID);
     setContext(Core::Context(CMakeProjectManager::Constants::C_CMAKEEDITOR,
               TextEditor::Constants::C_TEXTEDITOR));
     connect(document(), SIGNAL(changed()), this, SLOT(markAsChanged()));
@@ -72,11 +73,6 @@ Core::IEditor *CMakeEditor::duplicate()
     return ret->editor();
 }
 
-Core::Id CMakeEditor::id() const
-{
-    return Core::Id(CMakeProjectManager::Constants::CMAKE_EDITOR_ID);
-}
-
 TextEditor::CompletionAssistProvider *CMakeEditor::completionAssistProvider()
 {
     return ExtensionSystem::PluginManager::getObject<CMakeFileCompletionAssistProvider>();
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.h b/src/plugins/cmakeprojectmanager/cmakeeditor.h
index 035a10bcac..be52cb50df 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.h
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.h
@@ -54,7 +54,6 @@ public:
 
     bool duplicateSupported() const { return true; }
     Core::IEditor *duplicate();
-    Core::Id id() const;
     TextEditor::CompletionAssistProvider *completionAssistProvider();
 
 private slots:
diff --git a/src/plugins/coreplugin/editormanager/ieditor.cpp b/src/plugins/coreplugin/editormanager/ieditor.cpp
index f6ac60dbc7..cb9944d99b 100644
--- a/src/plugins/coreplugin/editormanager/ieditor.cpp
+++ b/src/plugins/coreplugin/editormanager/ieditor.cpp
@@ -56,3 +56,14 @@
   \sa Core::EditorFactoryInterface Core::IContext
 
 */
+
+
+void Core::IEditor::setId(Core::Id id)
+{
+    m_id = id;
+}
+
+Core::Id Core::IEditor::id() const
+{
+    return m_id;
+}
diff --git a/src/plugins/coreplugin/editormanager/ieditor.h b/src/plugins/coreplugin/editormanager/ieditor.h
index 75ba8ddf4b..cf63d0ca3d 100644
--- a/src/plugins/coreplugin/editormanager/ieditor.h
+++ b/src/plugins/coreplugin/editormanager/ieditor.h
@@ -47,9 +47,11 @@ public:
     IEditor(QObject *parent = 0) : IContext(parent) {}
     virtual ~IEditor() {}
 
+    void setId(Core::Id id);
+    Core::Id id() const;
+
     virtual bool open(QString *errorString, const QString &fileName, const QString &realFileName) = 0;
     virtual IDocument *document() = 0;
-    virtual Core::Id id() const = 0;
 
     virtual bool duplicateSupported() const { return false; }
     virtual IEditor *duplicate() { return 0; }
@@ -64,6 +66,9 @@ public:
     virtual QWidget *toolBar() = 0;
 
     virtual bool isDesignModePreferred() const { return false; }
+
+private:
+    Core::Id m_id;
 };
 
 } // namespace Core
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 0cc3ba85cd..fad4dc632e 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -504,6 +504,7 @@ bool handleDoxygenContinuation(QTextCursor &cursor,
 CPPEditor::CPPEditor(CPPEditorWidget *editor)
     : BaseTextEditor(editor)
 {
+    setId(CppEditor::Constants::CPPEDITOR_ID);
     m_context.add(CppEditor::Constants::C_CPPEDITOR);
     m_context.add(ProjectExplorer::Constants::LANG_CXX);
     m_context.add(TextEditor::Constants::C_TEXTEDITOR);
@@ -1499,11 +1500,6 @@ Core::IEditor *CPPEditor::duplicate()
     return newEditor->editor();
 }
 
-Core::Id CPPEditor::id() const
-{
-    return CppEditor::Constants::CPPEDITOR_ID;
-}
-
 bool CPPEditor::open(QString *errorString, const QString &fileName, const QString &realFileName)
 {
     if (!TextEditor::BaseTextEditor::open(errorString, fileName, realFileName))
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index 200ce45b9a..93732ceaeb 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -98,7 +98,6 @@ public:
 
     bool duplicateSupported() const { return true; }
     Core::IEditor *duplicate();
-    Core::Id id() const;
 
     bool open(QString *errorString, const QString &fileName, const QString &realFileName);
 
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index bf1e36f611..df614f14e9 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -60,9 +60,11 @@ class DescriptionEditor : public BaseTextEditor
 {
     Q_OBJECT
 public:
-    DescriptionEditor(BaseTextEditorWidget *editorWidget) : BaseTextEditor(editorWidget) {}
-
-    Core::Id id() const { return "DescriptionEditor"; }
+    DescriptionEditor(BaseTextEditorWidget *editorWidget)
+        : BaseTextEditor(editorWidget)
+    {
+        setId("DescriptionEditor");
+    }
 };
 
 class DescriptionEditorWidget : public BaseTextEditorWidget
@@ -147,6 +149,7 @@ DiffEditor::DiffEditor(DiffEditor *other)
 
 void DiffEditor::ctor()
 {
+    setId(Constants::DIFF_EDITOR_ID);
     QSplitter *splitter = new Core::MiniSplitter(Qt::Vertical);
 
     m_descriptionWidget = new Internal::DescriptionEditorWidget(splitter);
@@ -212,11 +215,6 @@ Core::IDocument *DiffEditor::document()
     return m_document.data();
 }
 
-Core::Id DiffEditor::id() const
-{
-    return Constants::DIFF_EDITOR_ID;
-}
-
 static QToolBar *createToolBar(const QWidget *someWidget)
 {
     // Create
diff --git a/src/plugins/diffeditor/diffeditor.h b/src/plugins/diffeditor/diffeditor.h
index 39810c47ee..a1228be2c2 100644
--- a/src/plugins/diffeditor/diffeditor.h
+++ b/src/plugins/diffeditor/diffeditor.h
@@ -67,7 +67,6 @@ public:
 
     bool open(QString *errorString, const QString &fileName, const QString &realFileName);
     Core::IDocument *document();
-    Core::Id id() const;
 
     QWidget *toolBar();
 
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
index 90001b7276..e0539f084b 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
@@ -360,12 +360,11 @@ public:
     SideDiffEditor(BaseTextEditorWidget *editorWidget)
         : BaseTextEditor(editorWidget)
     {
+        setId("SideDiffEditor");
         connect(this, SIGNAL(tooltipRequested(TextEditor::ITextEditor*,QPoint,int)),
                 this, SLOT(slotTooltipRequested(TextEditor::ITextEditor*,QPoint,int)));
     }
 
-    Core::Id id() const { return "SideDiffEditor"; }
-
 private slots:
     void slotTooltipRequested(TextEditor::ITextEditor *editor, const QPoint &globalPoint, int position);
 
diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
index 958b6c4063..7e9c44f445 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
@@ -78,14 +78,10 @@ Core::IEditor *ProjectFilesFactory::createEditor()
 ProjectFilesEditor::ProjectFilesEditor(ProjectFilesEditorWidget *editor)
   : BaseTextEditor(editor)
 {
+    setId(Constants::FILES_EDITOR_ID);
     setContext(Core::Context(Constants::C_FILESEDITOR));
 }
 
-Core::Id ProjectFilesEditor::id() const
-{
-    return Core::Id(Constants::FILES_EDITOR_ID);
-}
-
 bool ProjectFilesEditor::duplicateSupported() const
 {
     return true;
diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.h b/src/plugins/genericprojectmanager/genericprojectfileseditor.h
index 1236a8a924..149b98b614 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.h
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.h
@@ -59,7 +59,6 @@ class ProjectFilesEditor : public TextEditor::BaseTextEditor
 public:
     ProjectFilesEditor(ProjectFilesEditorWidget *editorWidget);
 
-    Core::Id id() const;
     bool duplicateSupported() const;
     Core::IEditor *duplicate();
 };
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index 9bc0913bbc..2f7a073f05 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -206,11 +206,6 @@ Core::IEditor *GLSLEditorEditable::duplicate()
     return newEditor->editor();
 }
 
-Core::Id GLSLEditorEditable::id() const
-{
-    return GLSLEditor::Constants::C_GLSLEDITOR_ID;
-}
-
 bool GLSLEditorEditable::open(QString *errorString, const QString &fileName, const QString &realFileName)
 {
     baseTextDocument()->setMimeType(Core::MimeDatabase::findByFile(QFileInfo(fileName)).type());
diff --git a/src/plugins/glsleditor/glsleditoreditable.cpp b/src/plugins/glsleditor/glsleditoreditable.cpp
index 2f07aac6b7..55f8b3324a 100644
--- a/src/plugins/glsleditor/glsleditoreditable.cpp
+++ b/src/plugins/glsleditor/glsleditoreditable.cpp
@@ -46,6 +46,7 @@ namespace Internal {
 GLSLEditorEditable::GLSLEditorEditable(GLSLTextEditorWidget *editor)
     : BaseTextEditor(editor)
 {
+    setId(GLSLEditor::Constants::C_GLSLEDITOR_ID);
     setContext(Core::Context(GLSLEditor::Constants::C_GLSLEDITOR_ID,
                              TextEditor::Constants::C_TEXTEDITOR));
 }
diff --git a/src/plugins/glsleditor/glsleditoreditable.h b/src/plugins/glsleditor/glsleditoreditable.h
index 8632c64fa9..3a45ed989a 100644
--- a/src/plugins/glsleditor/glsleditoreditable.h
+++ b/src/plugins/glsleditor/glsleditoreditable.h
@@ -46,7 +46,6 @@ public:
 
     bool duplicateSupported() const { return true; }
     Core::IEditor *duplicate();
-    Core::Id id() const;
     bool open(QString *errorString, const QString &fileName, const QString &realFileName);
     TextEditor::CompletionAssistProvider *completionAssistProvider();
 };
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index 63e4811da2..c691e9d4fa 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -62,6 +62,8 @@ ImageViewer::ImageViewer(QWidget *parent)
     : IEditor(parent),
     d(new ImageViewerPrivate)
 {
+    setId(Constants::IMAGEVIEWER_ID);
+
     d->file = new ImageViewerFile(this);
     d->imageView = new ImageView();
 
@@ -137,11 +139,6 @@ Core::IDocument *ImageViewer::document()
     return d->file;
 }
 
-Core::Id ImageViewer::id() const
-{
-    return Core::Id(Constants::IMAGEVIEWER_ID);
-}
-
 QWidget *ImageViewer::toolBar()
 {
     return d->toolbar;
diff --git a/src/plugins/imageviewer/imageviewer.h b/src/plugins/imageviewer/imageviewer.h
index 1ca58ce6dc..8b287d97f9 100644
--- a/src/plugins/imageviewer/imageviewer.h
+++ b/src/plugins/imageviewer/imageviewer.h
@@ -56,7 +56,6 @@ public:
 
     bool open(QString *errorString, const QString &fileName, const QString &realFileName);
     Core::IDocument *document();
-    Core::Id id() const;
     QWidget *toolBar();
 
 public slots:
diff --git a/src/plugins/pythoneditor/pythoneditor.cpp b/src/plugins/pythoneditor/pythoneditor.cpp
index 346c0f4019..72ef8d99a9 100644
--- a/src/plugins/pythoneditor/pythoneditor.cpp
+++ b/src/plugins/pythoneditor/pythoneditor.cpp
@@ -50,6 +50,7 @@ namespace Internal {
 PythonEditor::PythonEditor(EditorWidget *editorWidget)
     :BaseTextEditor(editorWidget)
 {
+    setId(Constants::C_PYTHONEDITOR_ID);
     setContext(Core::Context(Constants::C_PYTHONEDITOR_ID,
                              TextEditor::Constants::C_TEXTEDITOR));
 }
@@ -65,14 +66,6 @@ Core::IEditor *PythonEditor::duplicate()
     return widget->editor();
 }
 
-/**
- * @returns Unique editor class identifier, that is Constants::C_PYTHONEDITOR_ID
- */
-Core::Id PythonEditor::id() const
-{
-    return Core::Id(Constants::C_PYTHONEDITOR_ID);
-}
-
 bool PythonEditor::open(QString *errorString,
                         const QString &fileName,
                         const QString &realFileName)
diff --git a/src/plugins/pythoneditor/pythoneditor.h b/src/plugins/pythoneditor/pythoneditor.h
index a53d031abe..613aa5f02e 100644
--- a/src/plugins/pythoneditor/pythoneditor.h
+++ b/src/plugins/pythoneditor/pythoneditor.h
@@ -48,8 +48,6 @@ public:
     bool duplicateSupported() const { return true; }
     Core::IEditor *duplicate();
 
-    Core::Id id() const;
-
     /**
       Opens file for editing, actual work performed by base class
       */
diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp
index 67d9277bc0..5deac9e4fe 100644
--- a/src/plugins/qmakeprojectmanager/profileeditor.cpp
+++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp
@@ -55,6 +55,7 @@ namespace Internal {
 ProFileEditor::ProFileEditor(ProFileEditorWidget *editor)
   : BaseTextEditor(editor)
 {
+    setId(Constants::PROFILE_EDITOR_ID);
     setContext(Core::Context(Constants::C_PROFILEEDITOR,
               TextEditor::Constants::C_TEXTEDITOR));
 }
@@ -67,11 +68,6 @@ Core::IEditor *ProFileEditor::duplicate()
     return ret->editor();
 }
 
-Core::Id ProFileEditor::id() const
-{
-    return Core::Id(Constants::PROFILE_EDITOR_ID);
-}
-
 TextEditor::CompletionAssistProvider *ProFileEditor::completionAssistProvider()
 {
     return ExtensionSystem::PluginManager::getObject<ProFileCompletionAssistProvider>();
diff --git a/src/plugins/qmakeprojectmanager/profileeditor.h b/src/plugins/qmakeprojectmanager/profileeditor.h
index a45e83075b..682692727a 100644
--- a/src/plugins/qmakeprojectmanager/profileeditor.h
+++ b/src/plugins/qmakeprojectmanager/profileeditor.h
@@ -49,7 +49,6 @@ public:
 
     bool duplicateSupported() const { return true; }
     Core::IEditor *duplicate();
-    Core::Id id() const;
     TextEditor::CompletionAssistProvider *completionAssistProvider();
 };
 
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 6967362ad9..4afa47a2f4 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -183,11 +183,6 @@ IEditor *QmlJSEditor::duplicate()
     return newEditor->editor();
 }
 
-Id QmlJSEditor::id() const
-{
-    return Constants::C_QMLJSEDITOR_ID;
-}
-
 bool QmlJSEditor::open(QString *errorString, const QString &fileName, const QString &realFileName)
 {
     bool b = TextEditor::BaseTextEditor::open(errorString, fileName, realFileName);
diff --git a/src/plugins/qmljseditor/qmljseditoreditable.cpp b/src/plugins/qmljseditor/qmljseditoreditable.cpp
index aba39538c7..2517aae42c 100644
--- a/src/plugins/qmljseditor/qmljseditoreditable.cpp
+++ b/src/plugins/qmljseditor/qmljseditoreditable.cpp
@@ -50,6 +50,7 @@ namespace Internal {
 QmlJSEditor::QmlJSEditor(QmlJSTextEditorWidget *editor)
     : BaseTextEditor(editor)
 {
+    setId(Constants::C_QMLJSEDITOR_ID);
     m_context.add(Constants::C_QMLJSEDITOR_ID);
     m_context.add(TextEditor::Constants::C_TEXTEDITOR);
     m_context.add(ProjectExplorer::Constants::LANG_QMLJS);
diff --git a/src/plugins/qmljseditor/qmljseditoreditable.h b/src/plugins/qmljseditor/qmljseditoreditable.h
index bafdfd01e7..2899fe17e7 100644
--- a/src/plugins/qmljseditor/qmljseditoreditable.h
+++ b/src/plugins/qmljseditor/qmljseditoreditable.h
@@ -48,7 +48,6 @@ public:
 
     bool duplicateSupported() const { return true; }
     Core::IEditor *duplicate();
-    Core::Id id() const;
     bool open(QString *errorString, const QString &fileName, const QString &realFileName);
     bool isDesignModePreferred() const;
 
diff --git a/src/plugins/qnx/bardescriptoreditor.cpp b/src/plugins/qnx/bardescriptoreditor.cpp
index dfdfff6771..01b8401045 100644
--- a/src/plugins/qnx/bardescriptoreditor.cpp
+++ b/src/plugins/qnx/bardescriptoreditor.cpp
@@ -56,6 +56,7 @@ namespace Internal {
 
 BarDescriptorEditor::BarDescriptorEditor()
 {
+    setId(Constants::QNX_BAR_DESCRIPTOR_EDITOR_ID);
     m_file = new BarDescriptorDocument(this);
 
     BarDescriptorEditorWidget *editorWidget = new BarDescriptorEditorWidget(this);
@@ -122,11 +123,6 @@ Core::IDocument *BarDescriptorEditor::document()
     return m_file;
 }
 
-Core::Id BarDescriptorEditor::id() const
-{
-    return Constants::QNX_BAR_DESCRIPTOR_EDITOR_ID;
-}
-
 QWidget *BarDescriptorEditor::toolBar()
 {
     return m_toolBar;
diff --git a/src/plugins/qnx/bardescriptoreditor.h b/src/plugins/qnx/bardescriptoreditor.h
index 2327680a96..6088abcd2c 100644
--- a/src/plugins/qnx/bardescriptoreditor.h
+++ b/src/plugins/qnx/bardescriptoreditor.h
@@ -62,7 +62,6 @@ public:
 
     bool open(QString *errorString, const QString &fileName, const QString &realFileName);
     Core::IDocument *document();
-    Core::Id id() const;
     QWidget *toolBar();
 
     EditorPage activePage() const;
diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp
index 36ce8a14a1..6239aa8ba3 100644
--- a/src/plugins/resourceeditor/resourceeditorw.cpp
+++ b/src/plugins/resourceeditor/resourceeditorw.cpp
@@ -87,6 +87,7 @@ ResourceEditorW::ResourceEditorW(const Core::Context &context,
         m_contextMenu(new QMenu),
         m_toolBar(new QToolBar)
 {
+    setId(ResourceEditor::Constants::RESOURCEEDITOR_ID);
     setContext(context);
     setWidget(m_resourceEditor);
 
@@ -217,11 +218,6 @@ void ResourceEditorDocument::setBlockDirtyChanged(bool value)
     m_blockDirtyChanged = value;
 }
 
-Core::Id ResourceEditorW::id() const
-{
-    return Core::Id(ResourceEditor::Constants::RESOURCEEDITOR_ID);
-}
-
 QWidget *ResourceEditorW::toolBar()
 {
     return m_toolBar;
diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h
index 60ab486885..870e00c5a0 100644
--- a/src/plugins/resourceeditor/resourceeditorw.h
+++ b/src/plugins/resourceeditor/resourceeditorw.h
@@ -88,7 +88,6 @@ public:
     // IEditor
     bool open(QString *errorString, const QString &fileName, const QString &realFileName);
     Core::IDocument *document() { return m_resourceDocument; }
-    Core::Id id() const;
     QWidget *toolBar();
 
     void setSuggestedFileName(const QString &fileName);
diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp
index f0a47897a9..6b2ef7097b 100644
--- a/src/plugins/texteditor/plaintexteditor.cpp
+++ b/src/plugins/texteditor/plaintexteditor.cpp
@@ -63,6 +63,7 @@ namespace TextEditor {
 PlainTextEditor::PlainTextEditor(PlainTextEditorWidget *editor)
   : BaseTextEditor(editor)
 {
+    setId(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID);
     setContext(Core::Context(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID,
                              TextEditor::Constants::C_TEXTEDITOR));
 }
@@ -111,11 +112,6 @@ IEditor *PlainTextEditor::duplicate()
     return newWidget->editor();
 }
 
-Id PlainTextEditor::id() const
-{
-    return Core::Constants::K_DEFAULT_TEXT_EDITOR_ID;
-}
-
 void PlainTextEditorWidget::unCommentSelection()
 {
     Utils::unCommentSelection(this, m_commentDefinition);
diff --git a/src/plugins/texteditor/plaintexteditor.h b/src/plugins/texteditor/plaintexteditor.h
index dd2604a36e..fa3cd99014 100644
--- a/src/plugins/texteditor/plaintexteditor.h
+++ b/src/plugins/texteditor/plaintexteditor.h
@@ -49,7 +49,6 @@ public:
 
     bool duplicateSupported() const { return true; }
     Core::IEditor *duplicate();
-    Core::Id id() const;
 };
 
 class TEXTEDITOR_EXPORT PlainTextDocument : public BaseTextDocument
diff --git a/src/plugins/texteditor/snippets/snippeteditor.cpp b/src/plugins/texteditor/snippets/snippeteditor.cpp
index ed815d969d..73b06d9810 100644
--- a/src/plugins/texteditor/snippets/snippeteditor.cpp
+++ b/src/plugins/texteditor/snippets/snippeteditor.cpp
@@ -47,11 +47,7 @@ SnippetEditor::SnippetEditor(SnippetEditorWidget *editor)
     : BaseTextEditor(editor)
 {
     setContext(Core::Context(Constants::SNIPPET_EDITOR_ID, Constants::C_TEXTEDITOR));
-}
-
-Core::Id SnippetEditor::id() const
-{
-    return Core::Id(Constants::SNIPPET_EDITOR_ID);
+    setId(Constants::SNIPPET_EDITOR_ID);
 }
 
 SnippetEditorWidget::SnippetEditorWidget(QWidget *parent) : BaseTextEditorWidget(parent)
diff --git a/src/plugins/texteditor/snippets/snippeteditor.h b/src/plugins/texteditor/snippets/snippeteditor.h
index 564eccaa78..47a4078b4c 100644
--- a/src/plugins/texteditor/snippets/snippeteditor.h
+++ b/src/plugins/texteditor/snippets/snippeteditor.h
@@ -50,7 +50,6 @@ public:
 
     bool duplicateSupported() const { return false; }
     Core::IEditor *duplicate() { return 0; }
-    Core::Id id() const;
 };
 
 class TEXTEDITOR_EXPORT SnippetEditorWidget : public BaseTextEditorWidget
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 49fd76a43f..1602b8fa49 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -154,22 +154,17 @@ class VcsBaseEditor : public TextEditor::BaseTextEditor
 public:
     VcsBaseEditor(VcsBaseEditorWidget *, const VcsBaseEditorParameters *type);
 
-    Core::Id id() const { return m_id; }
-
 signals:
     void describeRequested(const QString &source, const QString &change);
     void annotateRevisionRequested(const QString &workingDirectory, const QString &file,
                                    const QString &change, int line);
-
-private:
-    Core::Id m_id;
 };
 
 VcsBaseEditor::VcsBaseEditor(VcsBaseEditorWidget *widget,
                              const VcsBaseEditorParameters *type)  :
-    BaseTextEditor(widget),
-    m_id(type->id)
+    BaseTextEditor(widget)
 {
+    setId(type->id);
     setContext(Core::Context(type->context, TextEditor::Constants::C_TEXTEDITOR));
 }
 
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index c79a1c4ebc..08413d4cd1 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -181,6 +181,7 @@ VcsBaseSubmitEditor::VcsBaseSubmitEditor(const VcsBaseSubmitEditorParameters *pa
                                          SubmitEditorWidget *editorWidget) :
     d(new VcsBaseSubmitEditorPrivate(parameters, editorWidget, this))
 {
+    setId(parameters->id);
     setContext(Core::Context(parameters->context));
     setWidget(d->m_widget);
     document()->setDisplayName(QCoreApplication::translate("VCS", d->m_parameters->displayName));
@@ -392,11 +393,6 @@ void VcsBaseSubmitEditor::setCheckScriptWorkingDirectory(const QString &s)
     d->m_checkScriptWorkingDirectory = s;
 }
 
-Core::Id VcsBaseSubmitEditor::id() const
-{
-    return d->m_parameters->id;
-}
-
 static QToolBar *createToolBar(const QWidget *someWidget, QAction *submitAction, QAction *diffAction)
 {
     // Create
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h
index 8468af0078..3547d70988 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.h
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h
@@ -114,7 +114,6 @@ public:
     // Core::IEditor
     bool open(QString *errorString, const QString &fileName, const QString &realFileName);
     Core::IDocument *document();
-    Core::Id id() const;
 
     QWidget *toolBar();