Editors: Move id() from editor to document.

Change-Id: Ib81076842ab1c16832224790194b001206404d64
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

58 files changed, 96 insertions, 78 deletions

diff --git a/src/plugins/android/androidmanifestdocument.cpp b/src/plugins/android/androidmanifestdocument.cpp
index 6ba9dc17db..10f5894801 100644
--- a/src/plugins/android/androidmanifestdocument.cpp
+++ b/src/plugins/android/androidmanifestdocument.cpp
@@ -44,6 +44,7 @@ AndroidManifestDocument::AndroidManifestDocument(AndroidManifestEditorWidget *ed
     : TextEditor::PlainTextDocument(),
       m_editorWidget(editorWidget)
 {
+    setId(Constants::ANDROID_MANIFEST_EDITOR_ID);
     setMimeType(QLatin1String(Constants::ANDROID_MANIFEST_MIME_TYPE));
     connect(editorWidget, SIGNAL(guiChanged()),
             this, SIGNAL(changed()));
diff --git a/src/plugins/android/androidmanifesteditor.cpp b/src/plugins/android/androidmanifesteditor.cpp
index 09b546bc12..6422701ef3 100644
--- a/src/plugins/android/androidmanifesteditor.cpp
+++ b/src/plugins/android/androidmanifesteditor.cpp
@@ -44,8 +44,6 @@ 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*)));
diff --git a/src/plugins/android/javaeditor.cpp b/src/plugins/android/javaeditor.cpp
index 219b55f0dd..21e2e3190c 100644
--- a/src/plugins/android/javaeditor.cpp
+++ b/src/plugins/android/javaeditor.cpp
@@ -52,7 +52,6 @@ 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));
 }
@@ -112,6 +111,7 @@ TextEditor::BaseTextEditor *JavaEditorWidget::createEditor()
 JavaDocument::JavaDocument()
         : TextEditor::BaseTextDocument()
 {
+    setId(Constants::JAVA_EDITOR_ID);
     setMimeType(QLatin1String(Constants::JAVA_MIMETYPE));
     setSyntaxHighlighter(TextEditor::createGenericSyntaxHighlighter(Core::MimeDatabase::findByType(QLatin1String(Constants::JAVA_MIMETYPE))));
     setIndenter(new JavaIndenter);
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp
index a2dd3898c7..1e4066a577 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectfile.cpp
@@ -40,6 +40,7 @@ AutotoolsProjectFile::AutotoolsProjectFile(AutotoolsProject *project, const QStr
     Core::IDocument(project),
     m_project(project)
 {
+    setId("Autotools.ProjectFile");
     setFilePath(fileName);
 }
 
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
index 69ad3a4aec..85c20efcda 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstyle.cpp
@@ -43,6 +43,7 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/project.h>
@@ -86,7 +87,7 @@ bool ArtisticStyle::initialize()
 
 void ArtisticStyle::updateActions(Core::IEditor *editor)
 {
-    m_formatFile->setEnabled(editor && editor->id() == CppEditor::Constants::CPPEDITOR_ID);
+    m_formatFile->setEnabled(editor && editor->document()->id() == CppEditor::Constants::CPPEDITOR_ID);
 }
 
 QList<QObject *> ArtisticStyle::autoReleaseObjects()
diff --git a/src/plugins/beautifier/clangformat/clangformat.cpp b/src/plugins/beautifier/clangformat/clangformat.cpp
index 5c6f929cbb..c0d0c91c81 100644
--- a/src/plugins/beautifier/clangformat/clangformat.cpp
+++ b/src/plugins/beautifier/clangformat/clangformat.cpp
@@ -43,6 +43,7 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <texteditor/basetexteditor.h>
 
@@ -91,7 +92,7 @@ bool ClangFormat::initialize()
 
 void ClangFormat::updateActions(Core::IEditor *editor)
 {
-    const bool enabled = (editor && editor->id() == CppEditor::Constants::CPPEDITOR_ID);
+    const bool enabled = (editor && editor->document()->id() == CppEditor::Constants::CPPEDITOR_ID);
     m_formatFile->setEnabled(enabled);
     m_formatRange->setEnabled(enabled);
 }
diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp
index dfcaf3fa44..9eb8017369 100644
--- a/src/plugins/beautifier/uncrustify/uncrustify.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp
@@ -43,6 +43,7 @@
 #include <coreplugin/editormanager/ieditor.h>
 #include <coreplugin/icontext.h>
 #include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
 #include <cppeditor/cppeditorconstants.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/project.h>
@@ -86,7 +87,7 @@ bool Uncrustify::initialize()
 
 void Uncrustify::updateActions(Core::IEditor *editor)
 {
-    m_formatFile->setEnabled(editor && editor->id() == CppEditor::Constants::CPPEDITOR_ID);
+    m_formatFile->setEnabled(editor && editor->document()->id() == CppEditor::Constants::CPPEDITOR_ID);
 }
 
 QList<QObject *> Uncrustify::autoReleaseObjects()
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 910764d913..f96ce29c20 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -205,6 +205,7 @@ public:
     BinEditorDocument(BinEditorWidget *parent) :
         Core::IDocument(parent)
     {
+        setId(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID);
         m_widget = parent;
         connect(m_widget, SIGNAL(dataRequested(quint64)),
             this, SLOT(provideData(quint64)));
@@ -340,7 +341,6 @@ 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);
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
index 0c8b863b64..4b682c3c04 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
@@ -59,7 +59,6 @@ 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()));
@@ -227,6 +226,7 @@ CMakeEditorWidget::Link CMakeEditorWidget::findLinkAt(const QTextCursor &cursor,
 CMakeDocument::CMakeDocument()
     : TextEditor::BaseTextDocument()
 {
+    setId(CMakeProjectManager::Constants::CMAKE_EDITOR_ID);
     setMimeType(QLatin1String(CMakeProjectManager::Constants::CMAKEMIMETYPE));
     setSyntaxHighlighter(new CMakeHighlighter);
 }
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 551b831c0b..55d262d967 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -763,6 +763,7 @@ void CMakeProject::createUiCodeModelSupport()
 CMakeFile::CMakeFile(CMakeProject *parent, QString fileName)
     : Core::IDocument(parent), m_project(parent)
 {
+    setId("Cmake.ProjectFile");
     setFilePath(fileName);
 }
 
diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp
index f2c70385bc..4734f845f9 100644
--- a/src/plugins/coreplugin/documentmanager.cpp
+++ b/src/plugins/coreplugin/documentmanager.cpp
@@ -1432,7 +1432,7 @@ void DocumentManager::executeOpenWithMenuAction(QAction *action)
                 = EditorManager::documentModel()->editorsForFilePath(entry.fileName);
         if (!editorsOpenForFile.isEmpty()) {
             foreach (IEditor *openEditor, editorsOpenForFile) {
-                if (entry.editorFactory->id() == openEditor->id())
+                if (entry.editorFactory->id() == openEditor->document()->id())
                     editorsOpenForFile.removeAll(openEditor);
             }
             if (!EditorManager::closeEditors(editorsOpenForFile)) // don't open if cancel was pressed
diff --git a/src/plugins/coreplugin/editormanager/documentmodel.cpp b/src/plugins/coreplugin/editormanager/documentmodel.cpp
index 0dd7c812ed..8199c307d3 100644
--- a/src/plugins/coreplugin/editormanager/documentmodel.cpp
+++ b/src/plugins/coreplugin/editormanager/documentmodel.cpp
@@ -137,7 +137,7 @@ void DocumentModel::addEditor(IEditor *editor, bool *isNewDocument)
     if (isNew) {
         Entry *entry = new Entry;
         entry->document = editor->document();
-        entry->m_id = editor->id();
+        entry->m_id = editor->document()->id();
         addEntry(entry);
     }
 }
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 1887a7246b..fac588e83f 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1419,7 +1419,7 @@ IEditor *EditorManager::createEditor(const Id &editorId, const QString &fileName
 
     IEditor *editor = factories.front()->createEditor();
     if (editor) {
-        QTC_CHECK(editor->id().isValid()); // sanity check that the editor has an id set
+        QTC_CHECK(editor->document()->id().isValid()); // sanity check that the editor has an id set
         connect(editor->document(), SIGNAL(changed()), m_instance, SLOT(handleDocumentStateChange()));
         emit m_instance->editorCreated(editor, fileName);
     }
@@ -1440,7 +1440,8 @@ void EditorManager::addEditor(IEditor *editor)
         const bool addWatcher = !isTemporary;
         DocumentManager::addDocument(editor->document(), addWatcher);
         if (!isTemporary)
-            DocumentManager::addToRecentFiles(editor->document()->filePath(), editor->id());
+            DocumentManager::addToRecentFiles(editor->document()->filePath(),
+                                              editor->document()->id());
     }
     emit m_instance->editorOpened(editor);
 }
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index 352c52ac00..c530f54f4c 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -209,7 +209,7 @@ void EditorView::updateEditorHistory(IEditor *editor, QList<EditLocation> &histo
     EditLocation location;
     location.document = document;
     location.fileName = document->filePath();
-    location.id = editor->id();
+    location.id = document->id();
     location.state = QVariant(state);
 
     for (int i = 0; i < history.size(); ++i) {
@@ -405,7 +405,7 @@ void EditorView::addCurrentPositionToNavigationHistory(IEditor *editor, const QB
     EditLocation location;
     location.document = document;
     location.fileName = document->filePath();
-    location.id = editor->id();
+    location.id = document->id();
     location.state = QVariant(state);
     m_currentNavigationHistoryPosition = qMin(m_currentNavigationHistoryPosition, m_navigationHistory.size()); // paranoia
     m_navigationHistory.insert(m_currentNavigationHistoryPosition, location);
@@ -460,7 +460,7 @@ void EditorView::updateCurrentPositionInNavigationHistory()
     }
     location->document = document;
     location->fileName = document->filePath();
-    location->id = editor->id();
+    location->id = document->id();
     location->state = QVariant(editor->saveState());
 }
 
@@ -769,10 +769,10 @@ QByteArray SplitterOrView::saveState() const
             stream << QByteArray("empty");
         } else if (e == EditorManager::currentEditor()) {
             stream << QByteArray("currenteditor")
-                    << e->document()->filePath() << e->id().toString() << e->saveState();
+                    << e->document()->filePath() << e->document()->id().toString() << e->saveState();
         } else {
             stream << QByteArray("editor")
-                    << e->document()->filePath() << e->id().toString() << e->saveState();
+                    << e->document()->filePath() << e->document()->id().toString() << e->saveState();
         }
     }
     return bytes;
diff --git a/src/plugins/coreplugin/editormanager/ieditor.cpp b/src/plugins/coreplugin/editormanager/ieditor.cpp
index cb9944d99b..f6ac60dbc7 100644
--- a/src/plugins/coreplugin/editormanager/ieditor.cpp
+++ b/src/plugins/coreplugin/editormanager/ieditor.cpp
@@ -56,14 +56,3 @@
   \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 cf63d0ca3d..afb9c33dd7 100644
--- a/src/plugins/coreplugin/editormanager/ieditor.h
+++ b/src/plugins/coreplugin/editormanager/ieditor.h
@@ -47,9 +47,6 @@ 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;
 
diff --git a/src/plugins/coreplugin/idocument.cpp b/src/plugins/coreplugin/idocument.cpp
index 1c9048d6cc..6bd6d77b1f 100644
--- a/src/plugins/coreplugin/idocument.cpp
+++ b/src/plugins/coreplugin/idocument.cpp
@@ -31,6 +31,8 @@
 
 #include "infobar.h"
 
+#include <utils/qtcassert.h>
+
 #include <QFile>
 #include <QFileInfo>
 
@@ -73,6 +75,17 @@ IDocument::~IDocument()
     delete m_infoBar;
 }
 
+void IDocument::setId(Id id)
+{
+    m_id = id;
+}
+
+Id IDocument::id() const
+{
+    QTC_CHECK(m_id.isValid());
+    return m_id;
+}
+
 /*!
     Used for example by EditorManager::openEditorWithContents() to set the contents
     of this document.
diff --git a/src/plugins/coreplugin/idocument.h b/src/plugins/coreplugin/idocument.h
index 483c7a8daa..d64502bd5a 100644
--- a/src/plugins/coreplugin/idocument.h
+++ b/src/plugins/coreplugin/idocument.h
@@ -31,6 +31,8 @@
 #define IDOCUMENT_H
 
 #include "core_global.h"
+#include "id.h"
+
 #include <QObject>
 
 namespace Core {
@@ -75,6 +77,9 @@ public:
     IDocument(QObject *parent = 0);
     virtual ~IDocument();
 
+    void setId(Core::Id id);
+    Core::Id id() const;
+
     virtual bool save(QString *errorString, const QString &fileName = QString(), bool autoSave = false) = 0;
     virtual bool setContents(const QByteArray &contents);
 
@@ -118,6 +123,7 @@ signals:
     void filePathChanged(const QString &oldName, const QString &newName);
 
 private:
+    Id m_id;
     QString m_filePath;
     QString m_displayName;
     bool m_temporary;
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index fad4dc632e..66b90a4f91 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -504,7 +504,6 @@ 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);
@@ -1966,6 +1965,7 @@ void CPPEditorWidget::showPreProcessorWidget()
 
 CPPEditorDocument::CPPEditorDocument()
 {
+    setId(CppEditor::Constants::CPPEDITOR_ID);
     connect(this, SIGNAL(tabSettingsChanged()),
             this, SLOT(invalidateFormatterCache()));
     connect(this, SIGNAL(mimeTypeChanged()),
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 61090b940f..997c5eea60 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -111,10 +111,11 @@ bool QmlCppEngine::canDisplayTooltip() const
 bool QmlCppEngine::setToolTipExpression(const QPoint & mousePos,
         TextEditor::ITextEditor *editor, const DebuggerToolTipContext &ctx)
 {
+    QTC_ASSERT(editor, return false);
     bool success = false;
-    if (editor->id() == CppEditor::Constants::CPPEDITOR_ID)
+    if (editor->document()->id() == CppEditor::Constants::CPPEDITOR_ID)
         success = d->m_cppEngine->setToolTipExpression(mousePos, editor, ctx);
-    else if (editor->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID)
+    else if (editor->document()->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID)
         success = d->m_qmlEngine->setToolTipExpression(mousePos, editor, ctx);
     return success;
 }
diff --git a/src/plugins/debugger/qml/qmlinspectoradapter.cpp b/src/plugins/debugger/qml/qmlinspectoradapter.cpp
index 12e21ecfd5..b4e8f1b3ec 100644
--- a/src/plugins/debugger/qml/qmlinspectoradapter.cpp
+++ b/src/plugins/debugger/qml/qmlinspectoradapter.cpp
@@ -294,7 +294,7 @@ void QmlInspectorAdapter::createPreviewForEditor(Core::IEditor *newEditor)
     if (!m_engineClientConnected)
         return;
 
-    if (!newEditor || newEditor->id()
+    if (!newEditor || newEditor->document()->id()
             != QmlJSEditor::Constants::C_QMLJSEDITOR_ID)
         return;
 
diff --git a/src/plugins/debugger/qml/qmllivetextpreview.cpp b/src/plugins/debugger/qml/qmllivetextpreview.cpp
index c98bebe848..33e6dc72a6 100644
--- a/src/plugins/debugger/qml/qmllivetextpreview.cpp
+++ b/src/plugins/debugger/qml/qmllivetextpreview.cpp
@@ -384,8 +384,9 @@ QmlLiveTextPreview::~QmlLiveTextPreview()
 
 void QmlLiveTextPreview::associateEditor(Core::IEditor *editor)
 {
+    QTC_ASSERT(editor, return);
     using namespace TextEditor;
-    if (editor->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID) {
+    if (editor->document()->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID) {
         QTC_ASSERT(QLatin1String(editor->widget()->metaObject()->className()) ==
                    QLatin1String("QmlJSEditor::Internal::QmlJSTextEditorWidget"),
                    return);
@@ -409,7 +410,7 @@ void QmlLiveTextPreview::associateEditor(Core::IEditor *editor)
 void QmlLiveTextPreview::unassociateEditor(Core::IEditor *oldEditor)
 {
     using namespace TextEditor;
-    if (oldEditor && oldEditor->id()
+    if (oldEditor && oldEditor->document()->id()
             == QmlJSEditor::Constants::C_QMLJSEDITOR_ID) {
         BaseTextEditorWidget *editWidget
                 = qobject_cast<BaseTextEditorWidget*>(oldEditor->widget());
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 9e22601ba9..b893149682 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -728,7 +728,7 @@ void FormEditorW::currentEditorChanged(IEditor *editor)
     if (Designer::Constants::Internal::debug)
         qDebug() << Q_FUNC_INFO << editor << " of " << m_fwm->formWindowCount();
 
-    if (editor && editor->id() == Constants::K_DESIGNER_XML_EDITOR_ID) {
+    if (editor && editor->document()->id() == Constants::K_DESIGNER_XML_EDITOR_ID) {
         FormWindowEditor *xmlEditor = qobject_cast<FormWindowEditor *>(editor);
         QTC_ASSERT(xmlEditor, return);
         ensureInitStage(FullyInitialized);
diff --git a/src/plugins/designer/formwindoweditor.cpp b/src/plugins/designer/formwindoweditor.cpp
index 5a2c6eb375..09a5607e53 100644
--- a/src/plugins/designer/formwindoweditor.cpp
+++ b/src/plugins/designer/formwindoweditor.cpp
@@ -54,7 +54,6 @@ FormWindowEditor::FormWindowEditor(Internal::DesignerXmlEditorWidget *editor) :
     TextEditor::PlainTextEditor(editor),
     d(new FormWindowEditorPrivate)
 {
-    setId(Core::Id(Designer::Constants::K_DESIGNER_XML_EDITOR_ID));
     d->m_widget = editor;
     setContext(Core::Context(Designer::Constants::K_DESIGNER_XML_EDITOR_ID,
                              Designer::Constants::C_DESIGNER_XML_EDITOR));
diff --git a/src/plugins/designer/formwindowfile.cpp b/src/plugins/designer/formwindowfile.cpp
index 73b5a7e4e7..bb301da91f 100644
--- a/src/plugins/designer/formwindowfile.cpp
+++ b/src/plugins/designer/formwindowfile.cpp
@@ -58,6 +58,7 @@ FormWindowFile::FormWindowFile(QDesignerFormWindowInterface *form, QObject *pare
     m_isModified(false)
 {
     setParent(parent);
+    setId(Core::Id(Designer::Constants::K_DESIGNER_XML_EDITOR_ID));
     // Designer needs UTF-8 regardless of settings.
     setCodec(QTextCodec::codecForName("UTF-8"));
     connect(m_formWindow->core()->formWindowManager(), SIGNAL(formWindowRemoved(QDesignerFormWindowInterface*)),
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index 77338f9870..ec2d205c8c 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -70,7 +70,7 @@ protected:
     BaseTextEditor *createEditor()
     {
         BaseTextEditor *editor = new BaseTextEditor(this);
-        editor->setId("DescriptionEditor");
+        editor->document()->setId("DiffEditor.DescriptionEditor");
         return editor;
     }
 };
@@ -141,7 +141,6 @@ 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);
diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp
index 36999ac8ca..fd7cdf2b74 100644
--- a/src/plugins/diffeditor/diffeditordocument.cpp
+++ b/src/plugins/diffeditor/diffeditordocument.cpp
@@ -40,6 +40,7 @@ DiffEditorDocument::DiffEditorDocument(const QString &mimeType) :
     m_mimeType(mimeType),
     m_diffEditorController(new DiffEditorController(this))
 {
+    setId(Constants::DIFF_EDITOR_ID);
     setDisplayName(QCoreApplication::translate("DiffEditor", Constants::DIFF_EDITOR_DISPLAY_NAME));
     setTemporary(true);
 }
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
index b6d62df7e1..e16c2d2715 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
@@ -78,7 +78,7 @@ public:
     SideDiffEditor(BaseTextEditorWidget *editorWidget)
         : BaseTextEditor(editorWidget)
     {
-        setId("SideDiffEditor");
+        document()->setId("DiffEditor.SideDiffEditor");
         connect(this, SIGNAL(tooltipRequested(TextEditor::ITextEditor*,QPoint,int)),
                 this, SLOT(slotTooltipRequested(TextEditor::ITextEditor*,QPoint,int)));
     }
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index a8d4bdadab..38227328d4 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -408,6 +408,7 @@ GenericProjectFile::GenericProjectFile(GenericProject *parent, QString fileName,
       m_project(parent),
       m_options(options)
 {
+    setId("Generic.ProjectFile");
     setFilePath(fileName);
 }
 
diff --git a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
index 7e9c44f445..56e1c2b4d7 100644
--- a/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectfileseditor.cpp
@@ -78,7 +78,7 @@ Core::IEditor *ProjectFilesFactory::createEditor()
 ProjectFilesEditor::ProjectFilesEditor(ProjectFilesEditorWidget *editor)
   : BaseTextEditor(editor)
 {
-    setId(Constants::FILES_EDITOR_ID);
+    document()->setId(Constants::FILES_EDITOR_ID);
     setContext(Core::Context(Constants::C_FILESEDITOR));
 }
 
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index 5b4b05e7f1..07328f34a7 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -303,7 +303,7 @@ void GitEditor::applyDiffChunk(const VcsBase::DiffChunk& chunk, bool revert)
 void GitEditor::init()
 {
     VcsBase::VcsBaseEditorWidget::init();
-    Core::Id editorId = editor()->id();
+    Core::Id editorId = editor()->document()->id();
     if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID)
         new GitSubmitHighlighter(baseTextDocument());
     else if (editorId == Git::Constants::GIT_REBASE_EDITOR_ID)
@@ -326,7 +326,7 @@ void GitEditor::addDiffActions(QMenu *menu, const VcsBase::DiffChunk &chunk)
 bool GitEditor::open(QString *errorString, const QString &fileName, const QString &realFileName)
 {
     bool res = VcsBaseEditorWidget::open(errorString, fileName, realFileName);
-    Core::Id editorId = editor()->id();
+    Core::Id editorId = editor()->document()->id();
     if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID
             || editorId == Git::Constants::GIT_REBASE_EDITOR_ID) {
         QFileInfo fi(fileName);
@@ -391,8 +391,8 @@ QString GitEditor::revisionSubject(const QTextBlock &inBlock) const
 bool GitEditor::supportChangeLinks() const
 {
     return VcsBaseEditorWidget::supportChangeLinks()
-            || (editor()->id() == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID)
-            || (editor()->id() == Git::Constants::GIT_REBASE_EDITOR_ID);
+            || (editor()->document()->id() == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID)
+            || (editor()->document()->id() == Git::Constants::GIT_REBASE_EDITOR_ID);
 }
 
 QString GitEditor::fileNameForLine(int line) const
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index 2f7a073f05..68ba232dce 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -143,6 +143,7 @@ void Document::addRange(const QTextCursor &cursor, GLSL::Scope *scope)
 GLSLTextEditorWidget::GLSLTextEditorWidget(QWidget *parent)
     : TextEditor::BaseTextEditorWidget(parent)
 {
+    baseTextDocument()->setId(GLSLEditor::Constants::C_GLSLEDITOR_ID);
     baseTextDocument()->setIndenter(new GLSLIndenter());
     ctor();
 }
diff --git a/src/plugins/glsleditor/glsleditoreditable.cpp b/src/plugins/glsleditor/glsleditoreditable.cpp
index 55f8b3324a..2f07aac6b7 100644
--- a/src/plugins/glsleditor/glsleditoreditable.cpp
+++ b/src/plugins/glsleditor/glsleditoreditable.cpp
@@ -46,7 +46,6 @@ 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/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index c691e9d4fa..248c2953f0 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -62,8 +62,6 @@ ImageViewer::ImageViewer(QWidget *parent)
     : IEditor(parent),
     d(new ImageViewerPrivate)
 {
-    setId(Constants::IMAGEVIEWER_ID);
-
     d->file = new ImageViewerFile(this);
     d->imageView = new ImageView();
 
diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp
index fd59de68a4..a5c06e0f08 100644
--- a/src/plugins/imageviewer/imageviewerfile.cpp
+++ b/src/plugins/imageviewer/imageviewerfile.cpp
@@ -30,6 +30,7 @@
 
 #include "imageviewerfile.h"
 #include "imageviewer.h"
+#include "imageviewerconstants.h"
 
 #include <QFileInfo>
 
@@ -39,6 +40,7 @@ namespace Internal {
 ImageViewerFile::ImageViewerFile(ImageViewer *parent)
     : Core::IDocument(parent)
 {
+    setId(Constants::IMAGEVIEWER_ID);
     m_editor = parent;
 }
 
diff --git a/src/plugins/pythoneditor/pythoneditor.cpp b/src/plugins/pythoneditor/pythoneditor.cpp
index 72ef8d99a9..e8ae93e3ae 100644
--- a/src/plugins/pythoneditor/pythoneditor.cpp
+++ b/src/plugins/pythoneditor/pythoneditor.cpp
@@ -50,7 +50,6 @@ namespace Internal {
 PythonEditor::PythonEditor(EditorWidget *editorWidget)
     :BaseTextEditor(editorWidget)
 {
-    setId(Constants::C_PYTHONEDITOR_ID);
     setContext(Core::Context(Constants::C_PYTHONEDITOR_ID,
                              TextEditor::Constants::C_TEXTEDITOR));
 }
diff --git a/src/plugins/pythoneditor/pythoneditorwidget.cpp b/src/plugins/pythoneditor/pythoneditorwidget.cpp
index e263ed445b..fc69254e9e 100644
--- a/src/plugins/pythoneditor/pythoneditorwidget.cpp
+++ b/src/plugins/pythoneditor/pythoneditorwidget.cpp
@@ -37,6 +37,7 @@
 #include "tools/pythonhighlighter.h"
 #include "tools/pythonindenter.h"
 #include "pythoneditor.h"
+#include "pythoneditorconstants.h"
 
 #include <texteditor/fontsettings.h>
 #include <texteditor/texteditorconstants.h>
@@ -50,6 +51,7 @@ namespace Internal {
 EditorWidget::EditorWidget(QWidget *parent)
     : TextEditor::BaseTextEditorWidget(parent)
 {
+    baseTextDocument()->setId(Constants::C_PYTHONEDITOR_ID);
     baseTextDocument()->setIndenter(new PythonIndenter());
     ctor();
 }
diff --git a/src/plugins/qbsprojectmanager/qbsprojectfile.cpp b/src/plugins/qbsprojectmanager/qbsprojectfile.cpp
index fa5d1e1b98..88a1ce496b 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectfile.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectfile.cpp
@@ -38,6 +38,7 @@ namespace Internal {
 QbsProjectFile::QbsProjectFile(QbsProject *parent, QString fileName) : Core::IDocument(parent),
     m_project(parent)
 {
+    setId("Qbs.ProjectFile");
     setFilePath(fileName);
 }
 
diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp
index 5deac9e4fe..99b92d7463 100644
--- a/src/plugins/qmakeprojectmanager/profileeditor.cpp
+++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp
@@ -55,7 +55,6 @@ namespace Internal {
 ProFileEditor::ProFileEditor(ProFileEditorWidget *editor)
   : BaseTextEditor(editor)
 {
-    setId(Constants::PROFILE_EDITOR_ID);
     setContext(Core::Context(Constants::C_PROFILEEDITOR,
               TextEditor::Constants::C_TEXTEDITOR));
 }
@@ -205,6 +204,7 @@ void ProFileEditorWidget::contextMenuEvent(QContextMenuEvent *e)
 ProFileDocument::ProFileDocument()
         : TextEditor::BaseTextDocument()
 {
+    setId(Constants::PROFILE_EDITOR_ID);
     setMimeType(QLatin1String(Constants::PROFILE_MIMETYPE));
     setSyntaxHighlighter(new ProFileHighlighter);
 }
diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
index 8820acbaa2..f0b280f480 100644
--- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp
@@ -183,6 +183,7 @@ using namespace QmakeProjectManager::Internal;
 QmakePriFile::QmakePriFile(QmakeProjectManager::QmakePriFileNode *qmakePriFile)
     : IDocument(qmakePriFile), m_priFile(qmakePriFile)
 {
+    setId("Qmake.PriFile");
     setFilePath(m_priFile->path());
 }
 
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
index f5b08cce9f..94f4396ada 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -271,6 +271,7 @@ QmakeProjectFile::QmakeProjectFile(const QString &filePath, QObject *parent)
     : Core::IDocument(parent),
       m_mimeType(QLatin1String(QmakeProjectManager::Constants::PROFILE_MIMETYPE))
 {
+    setId("Qmake.ProFile");
     setFilePath(filePath);
 }
 
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index 591f8e7b1e..354f631990 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -60,7 +60,7 @@ QmlDesignerPlugin *QmlDesignerPlugin::m_instance = 0;
 
 static bool isQmlFile(Core::IEditor *editor)
 {
-    return editor && editor->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID;
+    return editor && editor->document()->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID;
 }
 
 static bool isInDesignerMode()
@@ -324,9 +324,7 @@ void QmlDesignerPlugin::resetModelSelection()
 
 void QmlDesignerPlugin::onCurrentEditorChanged(Core::IEditor *editor)
 {
-    if (editor
-            && editor->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID
-            && isInDesignerMode())
+    if (isQmlFile(editor) && isInDesignerMode())
     {
         m_shortCutManager.updateActions(editor);
         changeEditor();
@@ -340,11 +338,7 @@ static bool isDesignerMode(Core::IMode *mode)
 
 void QmlDesignerPlugin::onCurrentModeChanged(Core::IMode *newMode, Core::IMode *oldMode)
 {
-    if (!Core::EditorManager::currentEditor())
-        return;
-
-    if (Core::EditorManager::currentEditor()
-            && Core::EditorManager::currentEditor()->id() != QmlJSEditor::Constants::C_QMLJSEDITOR_ID)
+    if (!isQmlFile(Core::EditorManager::currentEditor()))
         return;
 
     if ((currentDesignDocument()
@@ -437,8 +431,7 @@ const DesignerActionManager &QmlDesignerPlugin::designerActionManager() const
 void QmlDesignerPlugin::switchTextDesign()
 {
     if (Core::ModeManager::currentMode()->id() == Core::Constants::MODE_EDIT) {
-        Core::IEditor *editor = Core::EditorManager::currentEditor();
-        if (editor->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID)
+        if (isQmlFile(Core::EditorManager::currentEditor()))
             Core::ModeManager::activateMode(Core::Constants::MODE_DESIGN);
     } else if (Core::ModeManager::currentMode()->id() == Core::Constants::MODE_DESIGN) {
         Core::ModeManager::activateMode(Core::Constants::MODE_EDIT);
diff --git a/src/plugins/qmljseditor/qmljseditordocument.cpp b/src/plugins/qmljseditor/qmljseditordocument.cpp
index 4f2e07d96f..d35706df79 100644
--- a/src/plugins/qmljseditor/qmljseditordocument.cpp
+++ b/src/plugins/qmljseditor/qmljseditordocument.cpp
@@ -29,6 +29,7 @@
 
 #include "qmljseditordocument.h"
 
+#include "qmljseditorconstants.h"
 #include "qmljseditordocument_p.h"
 #include "qmljshighlighter.h"
 #include "qmljssemantichighlighter.h"
@@ -532,6 +533,7 @@ void QmlJSEditorDocumentPrivate::updateOutlineModel()
 QmlJSEditorDocument::QmlJSEditorDocument()
     : d(new Internal::QmlJSEditorDocumentPrivate(this))
 {
+    setId(Constants::C_QMLJSEDITOR_ID);
     connect(this, SIGNAL(tabSettingsChanged()),
             d, SLOT(invalidateFormatterCache()));
     setSyntaxHighlighter(new Highlighter(document()));
diff --git a/src/plugins/qmljseditor/qmljseditoreditable.cpp b/src/plugins/qmljseditor/qmljseditoreditable.cpp
index 2517aae42c..aba39538c7 100644
--- a/src/plugins/qmljseditor/qmljseditoreditable.cpp
+++ b/src/plugins/qmljseditor/qmljseditoreditable.cpp
@@ -50,7 +50,6 @@ 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/qmlprojectmanager/qmlprojectfile.cpp b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp
index f8d0868bed..ad7801211a 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp
@@ -41,6 +41,7 @@ QmlProjectFile::QmlProjectFile(QmlProject *parent, QString fileName)
 {
     QTC_CHECK(m_project);
     QTC_CHECK(!fileName.isEmpty());
+    setId("Qml.ProjectFile");
     setFilePath(fileName);
 }
 
diff --git a/src/plugins/qnx/bardescriptordocument.cpp b/src/plugins/qnx/bardescriptordocument.cpp
index 481465f1f1..4ac85d3d46 100644
--- a/src/plugins/qnx/bardescriptordocument.cpp
+++ b/src/plugins/qnx/bardescriptordocument.cpp
@@ -48,6 +48,7 @@ using namespace Qnx::Internal;
 BarDescriptorDocument::BarDescriptorDocument(QObject *parent)
     : Core::TextDocument(parent)
 {
+    setId(Constants::QNX_BAR_DESCRIPTOR_EDITOR_ID);
     // blackberry-nativepackager requires the XML file to be in UTF-8 encoding,
     // force if possible
     if (QTextCodec *defaultUTF8 = QTextCodec::codecForName("UTF-8"))
diff --git a/src/plugins/qnx/bardescriptoreditor.cpp b/src/plugins/qnx/bardescriptoreditor.cpp
index 01b8401045..dfd3d707fe 100644
--- a/src/plugins/qnx/bardescriptoreditor.cpp
+++ b/src/plugins/qnx/bardescriptoreditor.cpp
@@ -56,7 +56,6 @@ namespace Internal {
 
 BarDescriptorEditor::BarDescriptorEditor()
 {
-    setId(Constants::QNX_BAR_DESCRIPTOR_EDITOR_ID);
     m_file = new BarDescriptorDocument(this);
 
     BarDescriptorEditorWidget *editorWidget = new BarDescriptorEditorWidget(this);
diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp
index 6239aa8ba3..53ec554652 100644
--- a/src/plugins/resourceeditor/resourceeditorw.cpp
+++ b/src/plugins/resourceeditor/resourceeditorw.cpp
@@ -66,6 +66,7 @@ ResourceEditorDocument::ResourceEditorDocument(ResourceEditorW *parent) :
     m_blockDirtyChanged(false),
     m_parent(parent)
 {
+    setId(ResourceEditor::Constants::RESOURCEEDITOR_ID);
     setFilePath(parent->m_resourceEditor->fileName());
     if (debugResourceEditorW)
         qDebug() <<  "ResourceEditorFile::ResourceEditorFile()";
@@ -87,7 +88,6 @@ ResourceEditorW::ResourceEditorW(const Core::Context &context,
         m_contextMenu(new QMenu),
         m_toolBar(new QToolBar)
 {
-    setId(ResourceEditor::Constants::RESOURCEEDITOR_ID);
     setContext(context);
     setWidget(m_resourceEditor);
 
diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp
index a9b80b5403..067871ce05 100644
--- a/src/plugins/resourceeditor/resourcenode.cpp
+++ b/src/plugins/resourceeditor/resourcenode.cpp
@@ -407,6 +407,7 @@ void ResourceFolderNode::updateFiles(QList<ProjectExplorer::FileNode *> newList)
 ResourceFileWatcher::ResourceFileWatcher(ResourceTopLevelNode *node)
     : IDocument(node), m_node(node)
 {
+    setId("ResourceNodeWatcher");
     setFilePath(node->path());
 }
 
diff --git a/src/plugins/tasklist/taskfile.cpp b/src/plugins/tasklist/taskfile.cpp
index fdc934503a..6ea6ddf9aa 100644
--- a/src/plugins/tasklist/taskfile.cpp
+++ b/src/plugins/tasklist/taskfile.cpp
@@ -39,7 +39,9 @@ using namespace TaskList::Internal;
 // --------------------------------------------------------------------------
 
 TaskFile::TaskFile(QObject *parent) : Core::IDocument(parent)
-{ }
+{
+    setId("TaskList.TaskFile");
+}
 
 TaskFile::~TaskFile()
 { }
diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp
index 4d768a369e..58caa1e4ab 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.cpp
+++ b/src/plugins/texteditor/codeassist/codeassistant.cpp
@@ -182,7 +182,7 @@ void CodeAssistantPrivate::configure(BaseTextEditor *textEditor)
     m_completionProvider = textEditor->completionAssistProvider();
     m_quickFixProviders =
         ExtensionSystem::PluginManager::getObjects<QuickFixAssistProvider>();
-    filterEditorSpecificProviders(&m_quickFixProviders, m_textEditor->id());
+    filterEditorSpecificProviders(&m_quickFixProviders, m_textEditor->document()->id());
 
     m_textEditor->editorWidget()->installEventFilter(this);
     connect(m_textEditor->baseTextDocument(),SIGNAL(mimeTypeChanged()),
diff --git a/src/plugins/texteditor/plaintexteditor.cpp b/src/plugins/texteditor/plaintexteditor.cpp
index 6b2ef7097b..35184e6300 100644
--- a/src/plugins/texteditor/plaintexteditor.cpp
+++ b/src/plugins/texteditor/plaintexteditor.cpp
@@ -63,7 +63,6 @@ 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));
 }
@@ -185,6 +184,7 @@ void PlainTextEditorWidget::acceptMissingSyntaxDefinitionInfo()
 
 PlainTextDocument::PlainTextDocument()
 {
+    setId(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID);
     connect(this, SIGNAL(tabSettingsChanged()), this, SLOT(updateTabSettings()));
 }
 
diff --git a/src/plugins/texteditor/snippets/snippeteditor.cpp b/src/plugins/texteditor/snippets/snippeteditor.cpp
index 73b06d9810..72e7665f30 100644
--- a/src/plugins/texteditor/snippets/snippeteditor.cpp
+++ b/src/plugins/texteditor/snippets/snippeteditor.cpp
@@ -47,11 +47,11 @@ SnippetEditor::SnippetEditor(SnippetEditorWidget *editor)
     : BaseTextEditor(editor)
 {
     setContext(Core::Context(Constants::SNIPPET_EDITOR_ID, Constants::C_TEXTEDITOR));
-    setId(Constants::SNIPPET_EDITOR_ID);
 }
 
 SnippetEditorWidget::SnippetEditorWidget(QWidget *parent) : BaseTextEditorWidget(parent)
 {
+    baseTextDocument()->setId(Constants::SNIPPET_EDITOR_ID);
     setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
     setHighlightCurrentLine(false);
     setLineNumbersVisible(false);
diff --git a/src/plugins/vcsbase/submiteditorfile.cpp b/src/plugins/vcsbase/submiteditorfile.cpp
index 033f58b606..4101023ba2 100644
--- a/src/plugins/vcsbase/submiteditorfile.cpp
+++ b/src/plugins/vcsbase/submiteditorfile.cpp
@@ -45,12 +45,13 @@ using namespace VcsBase::Internal;
     submit editor files.
 */
 
-SubmitEditorFile::SubmitEditorFile(const QString &mimeType, VcsBaseSubmitEditor *parent) :
+SubmitEditorFile::SubmitEditorFile(const VcsBaseSubmitEditorParameters *parameters, VcsBaseSubmitEditor *parent) :
     Core::IDocument(parent),
-    m_mimeType(mimeType),
+    m_mimeType(QLatin1String(parameters->mimeType)),
     m_modified(false),
     m_editor(parent)
 {
+    setId(parameters->id);
     setTemporary(true);
 }
 
diff --git a/src/plugins/vcsbase/submiteditorfile.h b/src/plugins/vcsbase/submiteditorfile.h
index 0923e1b884..11801030d2 100644
--- a/src/plugins/vcsbase/submiteditorfile.h
+++ b/src/plugins/vcsbase/submiteditorfile.h
@@ -30,6 +30,8 @@
 #ifndef SUBMITEDITORFILE_H
 #define SUBMITEDITORFILE_H
 
+#include "vcsbasesubmiteditor.h"
+
 #include <coreplugin/idocument.h>
 
 namespace VcsBase {
@@ -41,7 +43,7 @@ class SubmitEditorFile : public Core::IDocument
 {
     Q_OBJECT
 public:
-    explicit SubmitEditorFile(const QString &mimeType,
+    explicit SubmitEditorFile(const VcsBaseSubmitEditorParameters *parameters,
                               VcsBaseSubmitEditor *parent = 0);
 
     bool setContents(const QByteArray &contents);
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 1602b8fa49..897f457346 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -164,7 +164,6 @@ VcsBaseEditor::VcsBaseEditor(VcsBaseEditorWidget *widget,
                              const VcsBaseEditorParameters *type)  :
     BaseTextEditor(widget)
 {
-    setId(type->id);
     setContext(Core::Context(type->context, TextEditor::Constants::C_TEXTEDITOR));
 }
 
@@ -652,6 +651,7 @@ VcsBaseEditorWidget::VcsBaseEditorWidget(const VcsBaseEditorParameters *type, QW
     d(new Internal::VcsBaseEditorWidgetPrivate(this, type))
 {
     viewport()->setMouseTracking(true);
+    baseTextDocument()->setId(type->id);
     baseTextDocument()->setMimeType(QLatin1String(d->m_parameters->mimeType));
 }
 
diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp
index d8dbb02961..55427c17a7 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.cpp
+++ b/src/plugins/vcsbase/vcsbaseplugin.cpp
@@ -567,8 +567,9 @@ void VcsBasePlugin::slotSubmitEditorAboutToClose(VcsBaseSubmitEditor *submitEdit
 {
     if (debug)
         qDebug() << this << "plugin's submit editor"
-                 << d->m_submitEditor << (d->m_submitEditor ? d->m_submitEditor->id().name() : "")
-                 << "closing submit editor" << submitEditor << submitEditor->id().name();
+                 << d->m_submitEditor << (d->m_submitEditor ? d->m_submitEditor->document()->id().name() : "")
+                 << "closing submit editor" << submitEditor
+                 << (submitEditor ? submitEditor->document()->id().name() : "");
     if (submitEditor == d->m_submitEditor)
         *result = submitEditorAboutToClose();
 }
diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index 08413d4cd1..d7eec403fb 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -167,7 +167,7 @@ VcsBaseSubmitEditorPrivate::VcsBaseSubmitEditorPrivate(const VcsBaseSubmitEditor
     m_widget(editorWidget),
     m_toolWidget(0),
     m_parameters(parameters),
-    m_file(new SubmitEditorFile(QLatin1String(parameters->mimeType), q)),
+    m_file(new SubmitEditorFile(parameters, q)),
     m_nickNameDialog(0)
 {
     QCompleter *completer = new QCompleter(q);
@@ -181,7 +181,6 @@ 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));