TextEditor: Consolidate document access functions.

There was document(), textDocument() and baseTextDocument().
Two should be enough...

Change-Id: Id9e41c8d857c5cb3269a9fce5ab594d34448c982
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

54 files changed, 154 insertions, 161 deletions

diff --git a/src/plugins/android/androidmanifesteditor.cpp b/src/plugins/android/androidmanifesteditor.cpp
index 6422701ef3..a3f6f7ad54 100644
--- a/src/plugins/android/androidmanifesteditor.cpp
+++ b/src/plugins/android/androidmanifesteditor.cpp
@@ -81,7 +81,7 @@ AndroidManifestEditorWidget *AndroidManifestEditor::widget() const
 
 Core::IDocument *AndroidManifestEditor::document()
 {
-    return textEditor()->baseTextDocument();
+    return textEditor()->textDocument();
 }
 
 TextEditor::BaseTextEditorWidget *AndroidManifestEditor::textEditor() const
diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index 0d58daac0b..b968c8f21c 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -472,7 +472,7 @@ bool AndroidManifestEditorWidget::eventFilter(QObject *obj, QEvent *event)
 
 void AndroidManifestEditorWidget::updateTargetComboBox()
 {
-    const QString docPath(m_textEditorWidget->baseTextDocument()->filePath());
+    const QString docPath(m_textEditorWidget->textDocument()->filePath());
     ProjectExplorer::Project *project = androidProject(docPath);
     QStringList items;
     if (project) {
@@ -573,7 +573,7 @@ void AndroidManifestEditorWidget::preSave()
         syncToEditor();
 
     if (m_setAppName && m_appNameInStringsXml) {
-        QString baseDir = QFileInfo(m_textEditorWidget->baseTextDocument()->filePath()).absolutePath();
+        QString baseDir = QFileInfo(m_textEditorWidget->textDocument()->filePath()).absolutePath();
         QString fileName = baseDir + QLatin1String("/res/values/strings.xml");
         QFile f(fileName);
         if (f.open(QIODevice::ReadOnly)) {
@@ -597,7 +597,7 @@ void AndroidManifestEditorWidget::preSave()
         m_setAppName = false;
     }
 
-    QString baseDir = QFileInfo(m_textEditorWidget->baseTextDocument()->filePath()).absolutePath();
+    QString baseDir = QFileInfo(m_textEditorWidget->textDocument()->filePath()).absolutePath();
     if (!m_lIconPath.isEmpty()) {
         copyIcon(LowDPI, baseDir, m_lIconPath);
         m_lIconPath.clear();
@@ -691,7 +691,7 @@ void AndroidManifestEditorWidget::updateInfoBar()
 
 void AndroidManifestEditorWidget::updateSdkVersions()
 {
-    const QString docPath(m_textEditorWidget->baseTextDocument()->filePath());
+    const QString docPath(m_textEditorWidget->textDocument()->filePath());
     QPair<int, int> apiLevels = AndroidManager::apiLevelRange();
     for (int i = apiLevels.first; i < apiLevels.second + 1; ++i)
         m_androidMinSdkVersion->addItem(tr("API %1: %2")
@@ -708,7 +708,7 @@ void AndroidManifestEditorWidget::updateSdkVersions()
 
 void AndroidManifestEditorWidget::updateInfoBar(const QString &errorMessage, int line, int column)
 {
-    Core::InfoBar *infoBar = m_textEditorWidget->baseTextDocument()->infoBar();
+    Core::InfoBar *infoBar = m_textEditorWidget->textDocument()->infoBar();
     QString text;
     if (line < 0)
         text = tr("Could not parse file: \"%1\".").arg(errorMessage);
@@ -726,7 +726,7 @@ void AndroidManifestEditorWidget::updateInfoBar(const QString &errorMessage, int
 
 void AndroidManifestEditorWidget::hideInfoBar()
 {
-    Core::InfoBar *infoBar = m_textEditorWidget->baseTextDocument()->infoBar();
+    Core::InfoBar *infoBar = m_textEditorWidget->textDocument()->infoBar();
         infoBar->removeInfo(infoBarId);
     m_timerParseCheck.stop();
 }
@@ -765,7 +765,7 @@ void AndroidManifestEditorWidget::syncToWidgets(const QDomDocument &doc)
     setApiLevel(m_androidMinSdkVersion, usesSdkElement, QLatin1String("android:minSdkVersion"));
     setApiLevel(m_androidTargetSdkVersion, usesSdkElement, QLatin1String("android:targetSdkVersion"));
 
-    QString baseDir = QFileInfo(m_textEditorWidget->baseTextDocument()->filePath()).absolutePath();
+    QString baseDir = QFileInfo(m_textEditorWidget->textDocument()->filePath()).absolutePath();
     QString fileName = baseDir + QLatin1String("/res/values/strings.xml");
 
     QDomElement applicationElement = manifest.firstChildElement(QLatin1String("application"));
@@ -1426,6 +1426,6 @@ AndroidManifestTextEditorWidget::AndroidManifestTextEditorWidget(AndroidManifest
       m_parent(parent)
 {
     setupAsPlainEditor();
-    baseTextDocument()->setMimeType(QLatin1String(Constants::ANDROID_MANIFEST_MIME_TYPE));
+    textDocument()->setMimeType(QLatin1String(Constants::ANDROID_MANIFEST_MIME_TYPE));
 }
 
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index 03ffa2e3a4..3fab90897d 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -1531,7 +1531,7 @@ IEditor *ClearCasePlugin::showOutputInEditor(const QString& title, const QString
         return 0;
     e->setForceReadOnly(true);
     s.replace(QLatin1Char(' '), QLatin1Char('_'));
-    e->baseTextDocument()->setSuggestedFileName(s);
+    e->textDocument()->setSuggestedFileName(s);
     if (!source.isEmpty())
         e->setSource(source);
     if (codec)
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
index 50c4eef74d..5c0b1fdd06 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
@@ -224,7 +224,7 @@ CMakeEditorWidget::Link CMakeEditorWidget::findLinkAt(const QTextCursor &cursor,
 
     // TODO: Resolve variables
 
-    QDir dir(QFileInfo(baseTextDocument()->filePath()).absolutePath());
+    QDir dir(QFileInfo(textDocument()->filePath()).absolutePath());
     QString fileName = dir.filePath(buffer);
     QFileInfo fi(fileName);
     if (fi.exists()) {
diff --git a/src/plugins/cppeditor/cppdocumentationcommenthelper.cpp b/src/plugins/cppeditor/cppdocumentationcommenthelper.cpp
index 7373da6055..2dadacfe63 100644
--- a/src/plugins/cppeditor/cppdocumentationcommenthelper.cpp
+++ b/src/plugins/cppeditor/cppdocumentationcommenthelper.cpp
@@ -294,7 +294,7 @@ bool CppDocumentationCommentHelper::handleKeyPressEvent(QKeyEvent *e) const
                         cursor.setPosition(pos);
                         cursor.insertText(comment);
                         cursor.setPosition(pos - 3, QTextCursor::KeepAnchor);
-                        m_editorWidget->baseTextDocument()->autoIndent(cursor);
+                        m_editorWidget->textDocument()->autoIndent(cursor);
                         cursor.endEditBlock();
                         e->accept();
                         return true;
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 68b10b4bb1..c46980d296 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -163,7 +163,7 @@ public:
 CppEditorWidgetPrivate::CppEditorWidgetPrivate(CppEditorWidget *q)
     : q(q)
     , m_modelManager(CppModelManagerInterface::instance())
-    , m_cppEditorDocument(qobject_cast<CPPEditorDocument *>(q->baseTextDocument()))
+    , m_cppEditorDocument(qobject_cast<CPPEditorDocument *>(q->textDocument()))
     , m_cppEditorOutline(new CppEditorOutline(q))
     , m_cppDocumentationCommentHelper(q)
     , m_localRenaming(q)
@@ -179,7 +179,7 @@ CppEditorWidgetPrivate::CppEditorWidgetPrivate(CppEditorWidget *q)
 CppEditorWidget::CppEditorWidget(QWidget *parent)
     : TextEditor::BaseTextEditorWidget(new CPPEditorDocument(), parent)
 {
-    baseTextDocument()->setIndenter(new CppTools::CppQtStyleIndenter);
+    textDocument()->setIndenter(new CppTools::CppQtStyleIndenter);
     ctor();
 }
 
@@ -215,7 +215,7 @@ void CppEditorWidget::ctor()
     connect(d->m_declDefLinkFinder, SIGNAL(foundLink(QSharedPointer<FunctionDeclDefLink>)),
             this, SLOT(onFunctionDeclDefLinkFound(QSharedPointer<FunctionDeclDefLink>)));
 
-    connect(baseTextDocument(), SIGNAL(filePathChanged(QString,QString)),
+    connect(textDocument(), SIGNAL(filePathChanged(QString,QString)),
             this, SLOT(onFilePathChanged()));
 
     connect(&d->m_localRenaming, SIGNAL(finished()),
@@ -566,7 +566,7 @@ void CppEditorWidget::highlightSymbolUsages(int from, int to)
     else if (!d->m_highlightWatcher || d->m_highlightWatcher->isCanceled())
         return; // aborted
 
-    TextEditor::SyntaxHighlighter *highlighter = baseTextDocument()->syntaxHighlighter();
+    TextEditor::SyntaxHighlighter *highlighter = textDocument()->syntaxHighlighter();
     QTC_ASSERT(highlighter, return);
 
     TextEditor::SemanticHighlighter::incrementalApplyExtraAdditionalFormats(
@@ -579,7 +579,7 @@ void CppEditorWidget::finishHighlightSymbolUsages()
     if (!d->m_highlightWatcher->isCanceled()
             && editorRevision() == d->m_highlightRevision
             && !d->m_lastSemanticInfo.doc.isNull()) {
-        TextEditor::SyntaxHighlighter *highlighter = baseTextDocument()->syntaxHighlighter();
+        TextEditor::SyntaxHighlighter *highlighter = textDocument()->syntaxHighlighter();
         QTC_CHECK(highlighter);
         if (highlighter)
             TextEditor::SemanticHighlighter::clearExtraAdditionalFormatsUntilEnd(highlighter,
@@ -796,13 +796,13 @@ bool CPPEditor::open(QString *errorString, const QString &fileName, const QStrin
 {
     if (!TextEditor::BaseTextEditor::open(errorString, fileName, realFileName))
         return false;
-    baseTextDocument()->setMimeType(Core::MimeDatabase::findByFile(QFileInfo(fileName)).type());
+    textDocument()->setMimeType(Core::MimeDatabase::findByFile(QFileInfo(fileName)).type());
     return true;
 }
 
 void CppEditorWidget::applyFontSettings()
 {
-    const TextEditor::FontSettings &fs = baseTextDocument()->fontSettings();
+    const TextEditor::FontSettings &fs = textDocument()->fontSettings();
 
     d->m_semanticHighlightFormatMap[CppHighlightingSupport::TypeUse] =
             fs.toTextCharFormat(TextEditor::C_TYPE);
@@ -913,7 +913,7 @@ void CppEditorWidget::updateSemanticInfo(const SemanticInfo &semanticInfo)
 
     // We can use the semanticInfo's snapshot (and avoid locking), but not its
     // document, since it doesn't contain expanded macros.
-    LookupContext context(semanticInfo.snapshot.document(baseTextDocument()->filePath()),
+    LookupContext context(semanticInfo.snapshot.document(textDocument()->filePath()),
                           semanticInfo.snapshot);
 
     SemanticInfo::LocalUseIterator it(semanticInfo.localUses);
@@ -1042,7 +1042,7 @@ void CppEditorWidget::onFunctionDeclDefLinkFound(QSharedPointer<FunctionDeclDefL
     d->m_declDefLink = link;
     Core::IDocument *targetDocument
             = Core::DocumentModel::documentForFilePath( d->m_declDefLink->targetFile->fileName());
-    if (baseTextDocument() != targetDocument) {
+    if (textDocument() != targetDocument) {
         if (auto textDocument = qobject_cast<TextEditor::BaseTextDocument *>(targetDocument))
             connect(textDocument, SIGNAL(contentsChanged()),
                     this, SLOT(abortDeclDefLink()));
@@ -1054,7 +1054,7 @@ void CppEditorWidget::onFilePathChanged()
 {
     QTC_ASSERT(d->m_modelManager, return);
     QByteArray additionalDirectives;
-    const QString &filePath = baseTextDocument()->filePath();
+    const QString &filePath = textDocument()->filePath();
     if (!filePath.isEmpty()) {
         const QString &projectFile = ProjectExplorer::SessionManager::value(
                     QLatin1String(Constants::CPP_PREPROCESSOR_PROJECT_PREFIX) + filePath).toString();
@@ -1091,7 +1091,7 @@ void CppEditorWidget::abortDeclDefLink()
 
     Core::IDocument *targetDocument
             = Core::DocumentModel::documentForFilePath(d->m_declDefLink->targetFile->fileName());
-    if (baseTextDocument() != targetDocument) {
+    if (textDocument() != targetDocument) {
         if (auto textDocument = qobject_cast<TextEditor::BaseTextDocument *>(targetDocument))
             disconnect(textDocument, SIGNAL(contentsChanged()),
                     this, SLOT(abortDeclDefLink()));
@@ -1113,7 +1113,7 @@ void CppEditorWidget::onLocalRenamingProcessKeyPressNormally(QKeyEvent *e)
 
 QTextCharFormat CppEditorWidget::textCharFormat(TextEditor::TextStyle category)
 {
-    return baseTextDocument()->fontSettings().toTextCharFormat(category);
+    return textDocument()->fontSettings().toTextCharFormat(category);
 }
 
 void CppEditorWidget::showPreProcessorWidget()
@@ -1127,7 +1127,7 @@ void CppEditorWidget::showPreProcessorWidget()
     if (projectParts.isEmpty())
         projectParts << d->m_modelManager->fallbackProjectPart();
 
-    CppPreProcessorDialog preProcessorDialog(this, baseTextDocument()->filePath(), projectParts);
+    CppPreProcessorDialog preProcessorDialog(this, textDocument()->filePath(), projectParts);
     if (preProcessorDialog.exec() == QDialog::Accepted) {
         QSharedPointer<SnapshotUpdater> updater
                 = d->m_modelManager->cppEditorSupport(editor())->snapshotUpdater();
diff --git a/src/plugins/cppeditor/cppeditoroutline.cpp b/src/plugins/cppeditor/cppeditoroutline.cpp
index 43596ed9fb..51533ef003 100644
--- a/src/plugins/cppeditor/cppeditoroutline.cpp
+++ b/src/plugins/cppeditor/cppeditoroutline.cpp
@@ -191,7 +191,7 @@ void CppEditorOutline::updateNow()
         return;
 
     const CPlusPlus::Snapshot snapshot = cmmi->snapshot();
-    const QString filePath = m_editorWidget->baseTextDocument()->filePath();
+    const QString filePath = m_editorWidget->textDocument()->filePath();
     CPlusPlus::Document::Ptr document = snapshot.document(filePath);
     if (!document)
         return;
diff --git a/src/plugins/cppeditor/cppelementevaluator.cpp b/src/plugins/cppeditor/cppelementevaluator.cpp
index c68d201e8c..0db58589ac 100644
--- a/src/plugins/cppeditor/cppelementevaluator.cpp
+++ b/src/plugins/cppeditor/cppelementevaluator.cpp
@@ -87,7 +87,7 @@ void CppElementEvaluator::execute()
         return;
 
     const Snapshot &snapshot = m_modelManager->snapshot();
-    Document::Ptr doc = snapshot.document(m_editor->baseTextDocument()->filePath());
+    Document::Ptr doc = snapshot.document(m_editor->textDocument()->filePath());
     if (!doc)
         return;
 
diff --git a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
index d8150dd3a7..d081b6eb80 100644
--- a/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
+++ b/src/plugins/cppeditor/cppfollowsymbolundercursor.cpp
@@ -550,7 +550,7 @@ BaseTextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor &
     }
 
     // Now we prefer the doc from the snapshot with macros expanded.
-    Document::Ptr doc = snapshot.document(m_widget->baseTextDocument()->filePath());
+    Document::Ptr doc = snapshot.document(m_widget->textDocument()->filePath());
     if (!doc) {
         doc = documentFromSemanticInfo;
         if (!doc)
@@ -645,7 +645,7 @@ BaseTextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor &
             if (Symbol *d = r.declaration()) {
                 if (d->isDeclaration() || d->isFunction()) {
                     const QString fileName = QString::fromUtf8(d->fileName(), d->fileNameLength());
-                    if (m_widget->baseTextDocument()->filePath() == fileName) {
+                    if (m_widget->textDocument()->filePath() == fileName) {
                         if (unsigned(lineNumber) == d->line()
                             && unsigned(positionInBlock) >= d->column()) { // TODO: check the end
                             result = r; // take the symbol under cursor.
diff --git a/src/plugins/cppeditor/cppincludehierarchy.cpp b/src/plugins/cppeditor/cppincludehierarchy.cpp
index 9858cecabe..a7cc16aa28 100644
--- a/src/plugins/cppeditor/cppincludehierarchy.cpp
+++ b/src/plugins/cppeditor/cppincludehierarchy.cpp
@@ -143,12 +143,12 @@ void CppIncludeHierarchyWidget::perform()
         return;
 
     m_model->clear();
-    m_model->buildHierarchy(m_editor, widget->baseTextDocument()->filePath());
+    m_model->buildHierarchy(m_editor, widget->textDocument()->filePath());
     if (m_model->isEmpty())
         return;
 
-    m_inspectedFile->setup(widget->baseTextDocument()->displayName(),
-                           widget->baseTextDocument()->filePath());
+    m_inspectedFile->setup(widget->textDocument()->displayName(),
+                           widget->textDocument()->filePath());
 
     //expand "Includes"
     m_treeView->expand(m_model->index(0, 0));
diff --git a/src/plugins/cppeditor/cpplocalrenaming.cpp b/src/plugins/cppeditor/cpplocalrenaming.cpp
index dfb127c9c9..d2a0c02282 100644
--- a/src/plugins/cppeditor/cpplocalrenaming.cpp
+++ b/src/plugins/cppeditor/cpplocalrenaming.cpp
@@ -296,7 +296,7 @@ void CppLocalRenaming::updateEditorWidgetWithSelections()
 
 QTextCharFormat CppLocalRenaming::textCharFormat(TextEditor::TextStyle category) const
 {
-    return m_editorWidget->baseTextDocument()->fontSettings().toTextCharFormat(category);
+    return m_editorWidget->textDocument()->fontSettings().toTextCharFormat(category);
 }
 
 void CppLocalRenaming::finishRenameChange()
diff --git a/src/plugins/cppeditor/cppquickfixassistant.cpp b/src/plugins/cppeditor/cppquickfixassistant.cpp
index 0009f09d31..5ccf31b71f 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.cpp
+++ b/src/plugins/cppeditor/cppquickfixassistant.cpp
@@ -87,7 +87,7 @@ const IAssistProvider *CppQuickFixAssistProcessor::provider() const
 CppQuickFixAssistInterface::CppQuickFixAssistInterface(CppEditorWidget *editor,
                                                        TextEditor::AssistReason reason)
     : DefaultAssistInterface(editor->document(), editor->position(),
-                             editor->baseTextDocument()->filePath(), reason)
+                             editor->textDocument()->filePath(), reason)
     , m_editor(editor)
     , m_semanticInfo(editor->semanticInfo())
     , m_snapshot(CppTools::CppModelManagerInterface::instance()->snapshot())
diff --git a/src/plugins/cppeditor/cppsnippetprovider.cpp b/src/plugins/cppeditor/cppsnippetprovider.cpp
index 5212e53e19..0b28166002 100644
--- a/src/plugins/cppeditor/cppsnippetprovider.cpp
+++ b/src/plugins/cppeditor/cppsnippetprovider.cpp
@@ -63,6 +63,6 @@ QString CppSnippetProvider::displayName() const
 void CppSnippetProvider::decorateEditor(TextEditor::SnippetEditorWidget *editor) const
 {
     editor->setSyntaxHighlighter(new CppHighlighter);
-    editor->baseTextDocument()->setIndenter(new CppTools::CppQtStyleIndenter);
+    editor->textDocument()->setIndenter(new CppTools::CppQtStyleIndenter);
     editor->editor()->setAutoCompleter(new CppAutoCompleter);
 }
diff --git a/src/plugins/cppeditor/fileandtokenactions_test.cpp b/src/plugins/cppeditor/fileandtokenactions_test.cpp
index 427a7146e4..cab09696c5 100644
--- a/src/plugins/cppeditor/fileandtokenactions_test.cpp
+++ b/src/plugins/cppeditor/fileandtokenactions_test.cpp
@@ -447,7 +447,7 @@ void InvokeCompletionTokenAction::run(CppEditorWidget *editorWidget)
     //    editorWidget->setFocus();
     QApplication::processEvents();
 
-    TestActionsTestCase::undoChangesInDocument(editorWidget->baseTextDocument());
+    TestActionsTestCase::undoChangesInDocument(editorWidget->textDocument());
 }
 
 class RunAllQuickFixesTokenAction : public TestActionsTestCase::AbstractAction
diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp
index 5a3b055e23..084e8c2d64 100644
--- a/src/plugins/cpptools/cppcodestylesettingspage.cpp
+++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp
@@ -465,7 +465,7 @@ void CppCodeStylePreferencesWidget::updatePreview()
     const TextEditor::TabSettings ts = cppCodeStylePreferences->currentTabSettings();
     QtStyleCodeFormatter formatter(ts, ccss);
     foreach (TextEditor::SnippetEditorWidget *preview, m_previews) {
-        preview->baseTextDocument()->setTabSettings(ts);
+        preview->textDocument()->setTabSettings(ts);
         preview->setCodeStyle(cppCodeStylePreferences);
 
         QTextDocument *doc = preview->document();
@@ -475,7 +475,7 @@ void CppCodeStylePreferencesWidget::updatePreview()
         QTextCursor tc = preview->textCursor();
         tc.beginEditBlock();
         while (block.isValid()) {
-            preview->baseTextDocument()->indenter()->indentBlock(doc, block, QChar::Null, ts);
+            preview->textDocument()->indenter()->indentBlock(doc, block, QChar::Null, ts);
 
             block = block.next();
         }
@@ -492,7 +492,7 @@ void CppCodeStylePreferencesWidget::decorateEditors(const TextEditor::FontSettin
         });
 
     foreach (TextEditor::SnippetEditorWidget *editor, m_previews) {
-        editor->baseTextDocument()->setFontSettings(fontSettings);
+        editor->textDocument()->setFontSettings(fontSettings);
         if (provider)
             provider->decorateEditor(editor);
     }
diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp
index c1e03a8401..d76c4c9d98 100644
--- a/src/plugins/cpptools/cppcompletion_test.cpp
+++ b/src/plugins/cpptools/cppcompletion_test.cpp
@@ -103,7 +103,7 @@ public:
         QStringList completions;
         CppCompletionAssistInterface *ai
             = new CppCompletionAssistInterface(m_editorWidget->document(), m_position,
-                                               m_editorWidget->baseTextDocument()->filePath(),
+                                               m_editorWidget->textDocument()->filePath(),
                                                ExplicitlyInvoked, m_snapshot,
                                                ProjectPart::HeaderPaths());
         CppCompletionAssistProcessor processor;
diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp
index 56f31d9218..f6d0ec1ce3 100644
--- a/src/plugins/cpptools/cpptoolseditorsupport.cpp
+++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp
@@ -121,7 +121,7 @@ CppEditorSupport::CppEditorSupport(CppModelManager *modelManager, BaseTextEditor
     , m_initialized(false)
     , m_lastHighlightRevision(0)
     , m_lastHighlightOnCompleteSemanticInfo(true)
-    , m_highlightingSupport(modelManager->highlightingSupport(textEditor->baseTextDocument()))
+    , m_highlightingSupport(modelManager->highlightingSupport(textEditor->textDocument()))
     , m_completionAssistProvider(
         modelManager->completionAssistProvider(textEditor->document()->mimeType()))
 {
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index cf9d2a8403..2efc277ea0 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -1185,7 +1185,7 @@ IEditor *CvsPlugin::showOutputInEditor(const QString& title, const QString &outp
     if (!e)
         return 0;
     s.replace(QLatin1Char(' '), QLatin1Char('_'));
-    e->baseTextDocument()->setSuggestedFileName(s);
+    e->textDocument()->setSuggestedFileName(s);
     e->setForceReadOnly(true);
     if (!source.isEmpty())
         e->setSource(source);
diff --git a/src/plugins/debugger/qml/qmllivetextpreview.cpp b/src/plugins/debugger/qml/qmllivetextpreview.cpp
index 33e6dc72a6..b5e97e5acb 100644
--- a/src/plugins/debugger/qml/qmllivetextpreview.cpp
+++ b/src/plugins/debugger/qml/qmllivetextpreview.cpp
@@ -714,7 +714,7 @@ void QmlLiveTextPreview::showSyncWarning(
 
     foreach (TextEditor::BaseTextEditorWidget *editor, m_editors) {
         if (editor) {
-            Core::InfoBar *infoBar = editor->baseTextDocument()->infoBar();
+            Core::InfoBar *infoBar = editor->textDocument()->infoBar();
             Core::InfoBarEntry info(Core::Id(INFO_OUT_OF_SYNC), errorMessage);
             BaseToolsClient *toolsClient = m_inspectorAdapter->toolsClient();
             if (toolsClient && toolsClient->supportReload())
@@ -735,7 +735,7 @@ void QmlLiveTextPreview::removeOutofSyncInfo()
 {
     foreach (TextEditor::BaseTextEditorWidget *editor, m_editors) {
         if (editor) {
-            Core::InfoBar *infoBar = editor->baseTextDocument()->infoBar();
+            Core::InfoBar *infoBar = editor->textDocument()->infoBar();
             infoBar->removeInfo(Core::Id(INFO_OUT_OF_SYNC));
         }
     }
diff --git a/src/plugins/debugger/sourceagent.cpp b/src/plugins/debugger/sourceagent.cpp
index 3458172a20..957ffd1a4a 100644
--- a/src/plugins/debugger/sourceagent.cpp
+++ b/src/plugins/debugger/sourceagent.cpp
@@ -136,7 +136,7 @@ void SourceAgent::updateLocationMarker()
     QTC_ASSERT(d->editor, return);
 
     if (d->locationMark)
-        d->editor->baseTextDocument()->removeMark(d->locationMark);
+        d->editor->textDocument()->removeMark(d->locationMark);
     delete d->locationMark;
     d->locationMark = 0;
     if (d->engine->stackHandler()->currentFrame().file == d->path) {
@@ -144,7 +144,7 @@ void SourceAgent::updateLocationMarker()
         d->locationMark = new TextEditor::TextMark(QString(), lineNumber);
         d->locationMark->setIcon(debuggerCore()->locationMarkIcon());
         d->locationMark->setPriority(TextEditor::TextMark::HighPriority);
-        d->editor->baseTextDocument()->addMark(d->locationMark);
+        d->editor->textDocument()->addMark(d->locationMark);
         QPlainTextEdit *plainTextEdit = d->editor->editorWidget();
         QTC_ASSERT(plainTextEdit, return);
         QTextCursor tc = plainTextEdit->textCursor();
diff --git a/src/plugins/designer/designerxmleditorwidget.cpp b/src/plugins/designer/designerxmleditorwidget.cpp
index 71f553d72c..f209a98ceb 100644
--- a/src/plugins/designer/designerxmleditorwidget.cpp
+++ b/src/plugins/designer/designerxmleditorwidget.cpp
@@ -44,7 +44,7 @@ DesignerXmlEditorWidget::DesignerXmlEditorWidget(QDesignerFormWindowInterface *f
 {
     setupAsPlainEditor();
     setReadOnly(true);
-    configureMimeType(baseTextDocument()->mimeType());
+    configureMimeType(textDocument()->mimeType());
 }
 
 TextEditor::BaseTextEditor *DesignerXmlEditorWidget::createEditor()
@@ -61,7 +61,7 @@ FormWindowEditor *DesignerXmlEditorWidget::designerEditor() const
 
 Internal::FormWindowFile *DesignerXmlEditorWidget::formWindowFile() const
 {
-    return qobject_cast<FormWindowFile *>(baseTextDocument());
+    return qobject_cast<FormWindowFile *>(textDocument());
 }
 
 } // namespace Internal
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index d5060a8c7f..97c7b90402 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -309,7 +309,7 @@ static void addDeclaration(const Snapshot &snapshot,
             tc.beginEditBlock();
             tc.insertText(loc.prefix() + declaration + loc.suffix());
             tc.setPosition(pos, QTextCursor::KeepAnchor);
-            widget->baseTextDocument()->autoIndent(tc);
+            widget->textDocument()->autoIndent(tc);
             tc.endEditBlock();
         }
     }
diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp
index 3b1bb16a8a..3f34e60beb 100644
--- a/src/plugins/diffeditor/diffeditor.cpp
+++ b/src/plugins/diffeditor/diffeditor.cpp
@@ -264,14 +264,14 @@ void DiffEditor::ctor()
             SLOT(setDisplaySettings(TextEditor::DisplaySettings)));
     connect(TextEditorSettings::instance(),
             SIGNAL(fontSettingsChanged(TextEditor::FontSettings)),
-            m_descriptionWidget->baseTextDocument(),
+            m_descriptionWidget->textDocument(),
             SLOT(setFontSettings(TextEditor::FontSettings)));
 
     m_descriptionWidget->setDisplaySettings(
                 TextEditorSettings::displaySettings());
     m_descriptionWidget->setCodeStyle(
                 TextEditorSettings::codeStyle());
-    m_descriptionWidget->baseTextDocument()->setFontSettings(
+    m_descriptionWidget->textDocument()->setFontSettings(
                 TextEditorSettings::fontSettings());
 
     m_controller = m_document->controller();
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
index 5ca731a0df..853035a970 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
@@ -348,7 +348,7 @@ void SideDiffEditorWidget::setDisplaySettings(const DisplaySettings &ds)
 void SideDiffEditorWidget::applyFontSettings()
 {
     SelectableTextEditorWidget::applyFontSettings();
-    const TextEditor::FontSettings &fs = baseTextDocument()->fontSettings();
+    const TextEditor::FontSettings &fs = textDocument()->fontSettings();
     m_fileLineForeground = fs.formatFor(C_DIFF_FILE_LINE).foreground();
     m_chunkLineForeground = fs.formatFor(C_DIFF_CONTEXT_LINE).foreground();
     m_textForeground = fs.toTextCharFormat(C_TEXT).foreground().color();
@@ -1161,8 +1161,8 @@ void SideBySideDiffEditorWidget::showDiff()
 void SideBySideDiffEditorWidget::setFontSettings(
         const TextEditor::FontSettings &fontSettings)
 {
-    m_leftEditor->baseTextDocument()->setFontSettings(fontSettings);
-    m_rightEditor->baseTextDocument()->setFontSettings(fontSettings);
+    m_leftEditor->textDocument()->setFontSettings(fontSettings);
+    m_rightEditor->textDocument()->setFontSettings(fontSettings);
 
     m_spanLineFormat  = fontSettings.toTextCharFormat(C_LINE_NUMBER);
     m_fileLineFormat  = fontSettings.toTextCharFormat(C_DIFF_FILE_LINE);
diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp
index 5858fe91ff..063160c854 100644
--- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp
+++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp
@@ -172,7 +172,7 @@ void UnifiedDiffEditorWidget::setDisplaySettings(const DisplaySettings &ds)
 
 void UnifiedDiffEditorWidget::setFontSettings(const FontSettings &fontSettings)
 {
-    baseTextDocument()->setFontSettings(fontSettings);
+    textDocument()->setFontSettings(fontSettings);
 
     m_fileLineFormat  = fontSettings.toTextCharFormat(C_DIFF_FILE_LINE);
     m_chunkLineFormat = fontSettings.toTextCharFormat(C_DIFF_CONTEXT_LINE);
diff --git a/src/plugins/emacskeys/emacskeysplugin.cpp b/src/plugins/emacskeys/emacskeysplugin.cpp
index fa55ecbaac..66b80c006e 100644
--- a/src/plugins/emacskeys/emacskeysplugin.cpp
+++ b/src/plugins/emacskeys/emacskeysplugin.cpp
@@ -322,7 +322,7 @@ void EmacsKeysPlugin::insertLineAndIndent()
     cursor.beginEditBlock();
     cursor.insertBlock();
     if (m_currentBaseTextEditorWidget != 0)
-        m_currentBaseTextEditorWidget->baseTextDocument()->autoIndent(cursor);
+        m_currentBaseTextEditorWidget->textDocument()->autoIndent(cursor);
     cursor.endEditBlock();
     m_currentEditorWidget->setTextCursor(cursor);
     m_currentState->endOwnAction(KeysActionOther);
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 37896e26d3..eb42a734c8 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -1921,7 +1921,7 @@ void FakeVimPluginPrivate::checkForElectricCharacter(bool *result, QChar c)
     if (!handler)
         return;
     if (BaseTextEditorWidget *bt = qobject_cast<BaseTextEditorWidget *>(handler->widget()))
-        *result = bt->baseTextDocument()->indenter()->isElectricCharacter(c);
+        *result = bt->textDocument()->indenter()->isElectricCharacter(c);
 }
 
 void FakeVimPluginPrivate::handleExCommand(bool *handled, const ExCommand &cmd)
@@ -2117,7 +2117,7 @@ void FakeVimPluginPrivate::indentRegion(int beginBlock, int endBlock,
             while (!cursor.atBlockEnd())
                 cursor.deleteChar();
         } else {
-            bt->baseTextDocument()->indenter()->indentBlock(doc, block, typedChar, tabSettings);
+            bt->textDocument()->indenter()->indentBlock(doc, block, typedChar, tabSettings);
         }
         block = block.next();
     }
diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index 0188415744..99e17b3a34 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -189,7 +189,7 @@ void GitEditorWidget::setPlainTextFiltered(const QString &text)
         break;
     }
 
-    baseTextDocument()->setPlainText(modText);
+    textDocument()->setPlainText(modText);
 }
 
 void GitEditorWidget::commandFinishedGotoLine(bool ok, int exitCode, const QVariant &v)
@@ -290,9 +290,9 @@ void GitEditorWidget::init()
     VcsBase::VcsBaseEditorWidget::init();
     Core::Id editorId = editor()->document()->id();
     if (editorId == Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID)
-        new GitSubmitHighlighter(baseTextDocument());
+        new GitSubmitHighlighter(textDocument());
     else if (editorId == Git::Constants::GIT_REBASE_EDITOR_ID)
-        new GitRebaseHighlighter(baseTextDocument());
+        new GitRebaseHighlighter(textDocument());
 }
 
 void GitEditorWidget::addDiffActions(QMenu *menu, const VcsBase::DiffChunk &chunk)
@@ -316,7 +316,7 @@ bool GitEditorWidget::open(QString *errorString, const QString &fileName, const
         QFileInfo fi(fileName);
         const QString gitPath = fi.absolutePath();
         setSource(gitPath);
-        baseTextDocument()->setCodec(
+        textDocument()->setCodec(
                     GitPlugin::instance()->gitClient()->encoding(gitPath, "i18n.commitEncoding"));
     }
     return VcsBaseEditorWidget::open(errorString, fileName, realFileName);
diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp
index 34f9de8918..fdffd25d79 100644
--- a/src/plugins/glsleditor/glsleditor.cpp
+++ b/src/plugins/glsleditor/glsleditor.cpp
@@ -166,7 +166,7 @@ void GlslEditorWidget::ctor()
 
     connect(this, SIGNAL(textChanged()), this, SLOT(updateDocument()));
 
-    new Highlighter(baseTextDocument());
+    new Highlighter(textDocument());
 
 //    if (m_modelManager) {
 //        m_semanticHighlighter->setModelManager(m_modelManager);
@@ -202,7 +202,7 @@ Core::IEditor *GlslEditor::duplicate()
 
 bool GlslEditor::open(QString *errorString, const QString &fileName, const QString &realFileName)
 {
-    baseTextDocument()->setMimeType(Core::MimeDatabase::findByFile(QFileInfo(fileName)).type());
+    textDocument()->setMimeType(Core::MimeDatabase::findByFile(QFileInfo(fileName)).type());
     bool b = TextEditor::BaseTextEditor::open(errorString, fileName, realFileName);
     return b;
 }
@@ -260,7 +260,7 @@ void GlslEditorWidget::updateDocumentNow()
 {
     m_updateDocumentTimer->stop();
 
-    int variant = languageVariant(baseTextDocument()->mimeType());
+    int variant = languageVariant(textDocument()->mimeType());
     const QString contents = toPlainText(); // get the code from the editor
     const QByteArray preprocessedCode = contents.toLatin1(); // ### use the QtCreator C++ preprocessor.
 
@@ -368,7 +368,7 @@ TextEditor::IAssistInterface *GlslEditorWidget::createAssistInterface(
                                                  position(),
                                                  editor()->document()->filePath(),
                                                  reason,
-                                                 baseTextDocument()->mimeType(),
+                                                 textDocument()->mimeType(),
                                                  m_glslDocument);
     return BaseTextEditorWidget::createAssistInterface(kind, reason);
 }
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index 556b467d7a..eee131f369 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -1212,7 +1212,7 @@ IEditor *PerforcePlugin::showOutputInEditor(const QString &title,
     e->setForceReadOnly(true);
     e->setSource(source);
     s.replace(QLatin1Char(' '), QLatin1Char('_'));
-    e->baseTextDocument()->setSuggestedFileName(s);
+    e->textDocument()->setSuggestedFileName(s);
     if (codec)
         e->setCodec(codec);
     return editor;
diff --git a/src/plugins/projectexplorer/environmentitemswidget.cpp b/src/plugins/projectexplorer/environmentitemswidget.cpp
index 9c89858984..f0f90d9462 100644
--- a/src/plugins/projectexplorer/environmentitemswidget.cpp
+++ b/src/plugins/projectexplorer/environmentitemswidget.cpp
@@ -71,7 +71,7 @@ EnvironmentItemsWidget::EnvironmentItemsWidget(QWidget *parent) :
     QWidget(parent), d(new EnvironmentItemsWidgetPrivate)
 {
     d->m_editor = new TextEditor::SnippetEditorWidget(this);
-    d->m_editor->baseTextDocument()->setFontSettings(TextEditor::TextEditorSettings::fontSettings());
+    d->m_editor->textDocument()->setFontSettings(TextEditor::TextEditorSettings::fontSettings());
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->addWidget(d->m_editor);
 }
diff --git a/src/plugins/pythoneditor/pythoneditor.cpp b/src/plugins/pythoneditor/pythoneditor.cpp
index 53945e7fe4..196091d480 100644
--- a/src/plugins/pythoneditor/pythoneditor.cpp
+++ b/src/plugins/pythoneditor/pythoneditor.cpp
@@ -68,7 +68,7 @@ bool PythonEditor::open(QString *errorString,
                         const QString &realFileName)
 {
     Core::MimeType mimeType = Core::MimeDatabase::findByFile(QFileInfo(fileName));
-    baseTextDocument()->setMimeType(mimeType.type());
+    textDocument()->setMimeType(mimeType.type());
     return TextEditor::BaseTextEditor::open(errorString, fileName, realFileName);
 }
 
diff --git a/src/plugins/pythoneditor/pythoneditorwidget.cpp b/src/plugins/pythoneditor/pythoneditorwidget.cpp
index 2fcf5a2c6e..08e1f35258 100644
--- a/src/plugins/pythoneditor/pythoneditorwidget.cpp
+++ b/src/plugins/pythoneditor/pythoneditorwidget.cpp
@@ -65,7 +65,7 @@ void PythonEditorWidget::ctor()
     setMarksVisible(true);
     setCodeFoldingSupported(true);
 
-    new PythonHighlighter(baseTextDocument());
+    new PythonHighlighter(textDocument());
 }
 
 TextEditor::BaseTextEditor *PythonEditorWidget::createEditor()
diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp
index d1563d48ac..31b2e4b477 100644
--- a/src/plugins/qmakeprojectmanager/profileeditor.cpp
+++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp
@@ -151,7 +151,7 @@ ProFileEditorWidget::Link ProFileEditorWidget::findLinkAt(const QTextCursor &cur
         }
     }
 
-    QDir dir(QFileInfo(baseTextDocument()->filePath()).absolutePath());
+    QDir dir(QFileInfo(textDocument()->filePath()).absolutePath());
     QString fileName = dir.filePath(buffer);
     QFileInfo fi(fileName);
     if (fi.exists()) {
diff --git a/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp b/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp
index e30e2fb6a1..345c66f07c 100644
--- a/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp
+++ b/src/plugins/qmldesigner/designercore/model/basetexteditmodifier.cpp
@@ -49,7 +49,7 @@ void BaseTextEditModifier::indent(int offset, int length)
 
     if (TextEditor::BaseTextEditorWidget *baseTextEditorWidget = qobject_cast<TextEditor::BaseTextEditorWidget*>(plainTextEdit())) {
 
-        TextEditor::BaseTextDocument *baseTextEditorDocument = baseTextEditorWidget->baseTextDocument();
+        TextEditor::BaseTextDocument *baseTextEditorDocument = baseTextEditorWidget->textDocument();
         QTextDocument *textDocument = baseTextEditorWidget->document();
         TextEditor::BaseTextEditor *baseTextEditor = baseTextEditorWidget->editor();
 
@@ -83,7 +83,7 @@ void BaseTextEditModifier::indent(int offset, int length)
 int BaseTextEditModifier::indentDepth() const
 {
     if (TextEditor::BaseTextEditorWidget *bte = qobject_cast<TextEditor::BaseTextEditorWidget*>(plainTextEdit()))
-        return bte->baseTextDocument()->tabSettings().m_indentSize;
+        return bte->textDocument()->tabSettings().m_indentSize;
     else
         return 0;
 }
@@ -92,7 +92,7 @@ bool BaseTextEditModifier::renameId(const QString &oldId, const QString &newId)
 {
     if (TextEditor::BaseTextEditorWidget *bte = qobject_cast<TextEditor::BaseTextEditorWidget*>(plainTextEdit())) {
         if (QmlJSEditor::QmlJSEditorDocument *document
-                = qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(bte->baseTextDocument())) {
+                = qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(bte->textDocument())) {
             Utils::ChangeSet changeSet;
             foreach (const QmlJS::AST::SourceLocation &loc,
                     document->semanticInfo().idLocations.value(oldId)) {
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index a4c3acde8e..f10a5f280f 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -111,7 +111,7 @@ QmlJSTextEditorWidget::QmlJSTextEditorWidget(QmlJSTextEditorWidget *other)
 
 void QmlJSTextEditorWidget::ctor()
 {
-    m_qmlJsEditorDocument = static_cast<QmlJSEditorDocument *>(baseTextDocument());
+    m_qmlJsEditorDocument = static_cast<QmlJSEditorDocument *>(textDocument());
     m_outlineCombo = 0;
     m_contextPane = 0;
     m_findReferences = new FindReferences(this);
@@ -132,7 +132,7 @@ void QmlJSTextEditorWidget::ctor()
     m_updateOutlineIndexTimer->setSingleShot(true);
     connect(m_updateOutlineIndexTimer, SIGNAL(timeout()), this, SLOT(updateOutlineIndexNow()));
 
-    baseTextDocument()->setCodec(QTextCodec::codecForName("UTF-8")); // qml files are defined to be utf-8
+    textDocument()->setCodec(QTextCodec::codecForName("UTF-8")); // qml files are defined to be utf-8
 
     m_modelManager = QmlJS::ModelManagerInterface::instance();
     m_contextPane = ExtensionSystem::PluginManager::getObject<QmlJS::IContextPane>();
@@ -186,7 +186,7 @@ IEditor *QmlJSEditor::duplicate()
 bool QmlJSEditor::open(QString *errorString, const QString &fileName, const QString &realFileName)
 {
     bool b = TextEditor::BaseTextEditor::open(errorString, fileName, realFileName);
-    baseTextDocument()->setMimeType(MimeDatabase::findByFile(QFileInfo(fileName)).type());
+    textDocument()->setMimeType(MimeDatabase::findByFile(QFileInfo(fileName)).type());
     return b;
 }
 
@@ -243,7 +243,7 @@ void QmlJSTextEditorWidget::updateCodeWarnings(QmlJS::Document::Ptr doc)
 void QmlJSTextEditorWidget::modificationChanged(bool changed)
 {
     if (!changed && m_modelManager)
-        m_modelManager->fileChangedOnDisk(baseTextDocument()->filePath());
+        m_modelManager->fileChangedOnDisk(textDocument()->filePath());
 }
 
 void QmlJSTextEditorWidget::jumpToOutlineElement(int /*index*/)
@@ -367,7 +367,7 @@ void QmlJSTextEditorWidget::updateUses()
             continue;
 
         QTextEdit::ExtraSelection sel;
-        sel.format = baseTextDocument()->fontSettings().toTextCharFormat(TextEditor::C_OCCURRENCES);
+        sel.format = textDocument()->fontSettings().toTextCharFormat(TextEditor::C_OCCURRENCES);
         sel.cursor = textCursor();
         sel.cursor.setPosition(loc.begin());
         sel.cursor.setPosition(loc.end(), QTextCursor::KeepAnchor);
@@ -666,12 +666,12 @@ TextEditor::BaseTextEditorWidget::Link QmlJSTextEditorWidget::findLinkAt(const Q
 
 void QmlJSTextEditorWidget::findUsages()
 {
-    m_findReferences->findUsages(baseTextDocument()->filePath(), textCursor().position());
+    m_findReferences->findUsages(textDocument()->filePath(), textCursor().position());
 }
 
 void QmlJSTextEditorWidget::renameUsages()
 {
-    m_findReferences->renameUsages(baseTextDocument()->filePath(), textCursor().position());
+    m_findReferences->renameUsages(textDocument()->filePath(), textCursor().position());
 }
 
 void QmlJSTextEditorWidget::showContextPane()
@@ -807,7 +807,7 @@ void QmlJSTextEditorWidget::semanticInfoUpdated(const SemanticInfo &semanticInfo
 {
     if (isVisible()) {
          // trigger semantic highlighting and model update if necessary
-        baseTextDocument()->triggerPendingUpdates();
+        textDocument()->triggerPendingUpdates();
     }
 
     if (m_contextPane) {
diff --git a/src/plugins/qmljseditor/qmljsquickfixassist.cpp b/src/plugins/qmljseditor/qmljsquickfixassist.cpp
index 8e9135a9ea..475aff7515 100644
--- a/src/plugins/qmljseditor/qmljsquickfixassist.cpp
+++ b/src/plugins/qmljseditor/qmljsquickfixassist.cpp
@@ -49,7 +49,7 @@ using namespace Internal;
 QmlJSQuickFixAssistInterface::QmlJSQuickFixAssistInterface(QmlJSTextEditorWidget *editor,
                                                            TextEditor::AssistReason reason)
     : DefaultAssistInterface(editor->document(), editor->position(),
-                             editor->baseTextDocument()->filePath(), reason)
+                             editor->textDocument()->filePath(), reason)
     , m_semanticInfo(editor->qmlJsEditorDocument()->semanticInfo())
     , m_currentFile(QmlJSRefactoringChanges::file(editor, m_semanticInfo.document))
 {}
diff --git a/src/plugins/qmljseditor/qmljssnippetprovider.cpp b/src/plugins/qmljseditor/qmljssnippetprovider.cpp
index ccbe1031a8..83ec7eb6ec 100644
--- a/src/plugins/qmljseditor/qmljssnippetprovider.cpp
+++ b/src/plugins/qmljseditor/qmljssnippetprovider.cpp
@@ -65,6 +65,6 @@ QString QmlJSSnippetProvider::displayName() const
 void QmlJSSnippetProvider::decorateEditor(TextEditor::SnippetEditorWidget *editor) const
 {
     editor->setSyntaxHighlighter(new Highlighter);
-    editor->baseTextDocument()->setIndenter(new Indenter);
+    editor->textDocument()->setIndenter(new Indenter);
     editor->editor()->setAutoCompleter(new AutoCompleter);
 }
diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp
index 5a50f7afce..416a47a9a2 100644
--- a/src/plugins/qmljseditor/quicktoolbar.cpp
+++ b/src/plugins/qmljseditor/quicktoolbar.cpp
@@ -423,7 +423,7 @@ void QuickToolBar::onEnabledChanged(bool b)
 void QuickToolBar::indentLines(int startLine, int endLine)
 {
     if (startLine > 0) {
-        TextEditor::TabSettings tabSettings = m_editor->baseTextDocument()->tabSettings();
+        TextEditor::TabSettings tabSettings = m_editor->textDocument()->tabSettings();
         for (int i = startLine; i <= endLine; i++) {
             QTextBlock start = m_editor->editorWidget()->document()->findBlockByNumber(i);
 
diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
index 14a75894b5..a554542f8b 100644
--- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
+++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp
@@ -101,7 +101,7 @@ void QmlJSCodeStylePreferencesWidget::decorateEditor(const TextEditor::FontSetti
             return current->groupId() == QLatin1String(QmlJSEditor::Constants::QML_SNIPPETS_GROUP_ID);
         });
 
-    m_ui->previewTextEdit->baseTextDocument()->setFontSettings(fontSettings);
+    m_ui->previewTextEdit->textDocument()->setFontSettings(fontSettings);
     if (provider)
         provider->decorateEditor(m_ui->previewTextEdit);
 }
@@ -125,7 +125,7 @@ void QmlJSCodeStylePreferencesWidget::updatePreview()
     const TextEditor::TabSettings &ts = m_preferences
             ? m_preferences->currentTabSettings()
             : TextEditorSettings::codeStyle()->tabSettings();
-    m_ui->previewTextEdit->baseTextDocument()->setTabSettings(ts);
+    m_ui->previewTextEdit->textDocument()->setTabSettings(ts);
     CreatorCodeFormatter formatter(ts);
     formatter.invalidateCache(doc);
 
@@ -133,7 +133,7 @@ void QmlJSCodeStylePreferencesWidget::updatePreview()
     QTextCursor tc = m_ui->previewTextEdit->textCursor();
     tc.beginEditBlock();
     while (block.isValid()) {
-        m_ui->previewTextEdit->baseTextDocument()->indenter()
+        m_ui->previewTextEdit->textDocument()->indenter()
                 ->indentBlock(doc, block, QChar::Null, ts);
         block = block.next();
     }
diff --git a/src/plugins/qnx/bardescriptoreditor.cpp b/src/plugins/qnx/bardescriptoreditor.cpp
index dfd3d707fe..dee7b4fae8 100644
--- a/src/plugins/qnx/bardescriptoreditor.cpp
+++ b/src/plugins/qnx/bardescriptoreditor.cpp
@@ -159,7 +159,7 @@ void BarDescriptorEditor::updateCursorPosition()
     const int line = block.blockNumber() + 1;
     const int column = cursor.position() - block.position();
     m_cursorPositionLabel->setText(tr("Line: %1, Col: %2").arg(line)
-                                   .arg(editorWidget->sourceWidget()->baseTextDocument()
+                                   .arg(editorWidget->sourceWidget()->textDocument()
                                         ->tabSettings().columnAt(block.text(), column)+1),
                                    tr("Line: 9999, Col: 999"));
     if (!block.isVisible())
diff --git a/src/plugins/qnx/bardescriptoreditorwidget.cpp b/src/plugins/qnx/bardescriptoreditorwidget.cpp
index f1edfdfc57..20c7eb6a9d 100644
--- a/src/plugins/qnx/bardescriptoreditorwidget.cpp
+++ b/src/plugins/qnx/bardescriptoreditorwidget.cpp
@@ -193,7 +193,7 @@ TextEditor::BaseTextEditorWidget *BarDescriptorEditorWidget::sourceWidget() cons
 
 void BarDescriptorEditorWidget::setFilePath(const QString &filePath)
 {
-    Core::IDocument *doc = m_xmlSourceWidget->baseTextDocument();
+    Core::IDocument *doc = m_xmlSourceWidget->textDocument();
     if (doc)
         doc->setFilePath(filePath);
 }
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index df940de940..12a68f84d0 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -1043,7 +1043,7 @@ IEditor *SubversionPlugin::showOutputInEditor(const QString &title, const QStrin
         return 0;
     e->setForceReadOnly(true);
     s.replace(QLatin1Char(' '), QLatin1Char('_'));
-    e->baseTextDocument()->setSuggestedFileName(s);
+    e->textDocument()->setSuggestedFileName(s);
     if (!source.isEmpty())
         e->setSource(source);
     if (codec)
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 0edf3ea701..312db11157 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -996,7 +996,7 @@ void BaseTextEditorWidgetPrivate::foldLicenseHeader()
     }
 }
 
-BaseTextDocument *BaseTextEditorWidget::baseTextDocument() const
+BaseTextDocument *BaseTextEditorWidget::textDocument() const
 {
     return d->m_document.data();
 }
@@ -1396,12 +1396,12 @@ void BaseTextEditorWidget::lowercaseSelection()
 
 void BaseTextEditorWidget::indent()
 {
-    setTextCursor(baseTextDocument()->indent(textCursor()));
+    setTextCursor(textDocument()->indent(textCursor()));
 }
 
 void BaseTextEditorWidget::unindent()
 {
-    setTextCursor(baseTextDocument()->unindent(textCursor()));
+    setTextCursor(textDocument()->unindent(textCursor()));
 }
 
 void BaseTextEditorWidget::undo()
@@ -2361,8 +2361,8 @@ void BaseTextEditorWidget::insertCodeSnippet(const QTextCursor &cursor_arg, cons
         QTextEdit::ExtraSelection selection;
         selection.cursor = tc;
         selection.format = (length
-                            ? baseTextDocument()->fontSettings().toTextCharFormat(C_OCCURRENCES)
-                            : baseTextDocument()->fontSettings().toTextCharFormat(C_OCCURRENCES_RENAME));
+                            ? textDocument()->fontSettings().toTextCharFormat(C_OCCURRENCES)
+                            : textDocument()->fontSettings().toTextCharFormat(C_OCCURRENCES_RENAME));
         selections.append(selection);
         manglers << data.ranges.at(i).mangler;
     }
@@ -3392,7 +3392,7 @@ void BaseTextEditorWidget::paintEvent(QPaintEvent *e)
     QTextDocument *doc = document();
     BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(doc->documentLayout());
     QTC_ASSERT(documentLayout, return);
-    const FontSettings &fs = baseTextDocument()->fontSettings();
+    const FontSettings &fs = textDocument()->fontSettings();
     const QTextCharFormat &searchScopeFormat = fs.toTextCharFormat(C_SEARCH_SCOPE);
     const QTextCharFormat &ifdefedOutFormat = fs.toTextCharFormat(C_DISABLED_CODE);
 
@@ -4087,7 +4087,7 @@ void BaseTextEditorWidget::drawCollapsedBlockPopup(QPainter &painter,
     painter.translate(.5, .5);
     QBrush brush = palette().base();
     const QTextCharFormat &ifdefedOutFormat
-            = baseTextDocument()->fontSettings().toTextCharFormat(C_DISABLED_CODE);
+            = textDocument()->fontSettings().toTextCharFormat(C_DISABLED_CODE);
     if (ifdefedOutFormat.hasProperty(QTextFormat::BackgroundBrush))
         brush = ifdefedOutFormat.background();
     painter.setBrush(brush);
@@ -4134,7 +4134,7 @@ int BaseTextEditorWidget::extraAreaWidth(int *markWidthPtr) const
         // this works under the assumption that bold or italic
         // can only make a font wider
         const QTextCharFormat &currentLineNumberFormat
-                = baseTextDocument()->fontSettings().toTextCharFormat(C_CURRENT_LINE_NUMBER);
+                = textDocument()->fontSettings().toTextCharFormat(C_CURRENT_LINE_NUMBER);
         fnt.setBold(currentLineNumberFormat.font().bold());
         fnt.setItalic(currentLineNumberFormat.font().italic());
         const QFontMetrics linefm(fnt);
@@ -4361,7 +4361,7 @@ void BaseTextEditorWidget::extraAreaPaintEvent(QPaintEvent *e)
                 painter.save();
                 QFont f = painter.font();
                 const QTextCharFormat &currentLineNumberFormat
-                        = baseTextDocument()->fontSettings().toTextCharFormat(C_CURRENT_LINE_NUMBER);
+                        = textDocument()->fontSettings().toTextCharFormat(C_CURRENT_LINE_NUMBER);
                 f.setBold(currentLineNumberFormat.font().bold());
                 f.setItalic(currentLineNumberFormat.font().italic());
                 painter.setFont(f);
@@ -4466,7 +4466,7 @@ void BaseTextEditorWidgetPrivate::updateCurrentLineHighlight()
 
     if (m_highlightCurrentLine) {
         QTextEdit::ExtraSelection sel;
-        sel.format.setBackground(q->baseTextDocument()->fontSettings()
+        sel.format.setBackground(q->textDocument()->fontSettings()
                                  .toTextCharFormat(C_CURRENT_LINE).background());
         sel.format.setProperty(QTextFormat::FullWidthSelection, true);
         sel.cursor = q->textCursor();
@@ -5068,7 +5068,7 @@ Core::Id BaseTextEditorWidget::languageSettingsId() const
 
 void BaseTextEditorWidget::setCodeStyle(ICodeStylePreferences *preferences)
 {
-    baseTextDocument()->indenter()->setCodeStylePreferences(preferences);
+    textDocument()->indenter()->setCodeStylePreferences(preferences);
     if (d->m_codeStylePreferences) {
         disconnect(d->m_codeStylePreferences, SIGNAL(currentTabSettingsChanged(TextEditor::TabSettings)),
                 d->m_document.data(), SLOT(setTabSettings(TextEditor::TabSettings)));
@@ -5266,7 +5266,7 @@ bool BaseTextEditorWidget::openLink(const Link &link, bool inNextSplit)
 
     if (inNextSplit) {
         Core::EditorManager::gotoOtherSplit();
-    } else if (baseTextDocument()->filePath() == link.targetFileName) {
+    } else if (textDocument()->filePath() == link.targetFileName) {
         Core::EditorManager::addCurrentPositionToNavigationHistory();
         gotoLine(link.targetLine, link.targetColumn);
         setFocus();
@@ -5313,7 +5313,7 @@ void BaseTextEditorWidgetPrivate::showLink(const BaseTextEditorWidget::Link &lin
     sel.cursor = q->textCursor();
     sel.cursor.setPosition(link.linkTextStart);
     sel.cursor.setPosition(link.linkTextEnd, QTextCursor::KeepAnchor);
-    sel.format = q->baseTextDocument()->fontSettings().toTextCharFormat(C_LINK);
+    sel.format = q->textDocument()->fontSettings().toTextCharFormat(C_LINK);
     sel.format.setFontUnderline(true);
     q->setExtraSelections(BaseTextEditorWidget::OtherSelection, QList<QTextEdit::ExtraSelection>() << sel);
     q->viewport()->setCursor(Qt::PointingHandCursor);
@@ -5488,7 +5488,7 @@ void BaseTextEditorWidgetPrivate::_q_matchParentheses()
     }
 
     const QTextCharFormat &matchFormat
-            = q->baseTextDocument()->fontSettings().toTextCharFormat(C_PARENTHESES);
+            = q->textDocument()->fontSettings().toTextCharFormat(C_PARENTHESES);
     int animatePosition = -1;
     if (backwardMatch.hasSelection()) {
         QTextEdit::ExtraSelection sel;
@@ -5991,13 +5991,13 @@ void BaseTextEditorWidget::triggerPendingUpdates()
 {
     if (d->m_fontSettingsNeedsApply)
         applyFontSettings();
-    baseTextDocument()->triggerPendingUpdates();
+    textDocument()->triggerPendingUpdates();
 }
 
 void BaseTextEditorWidget::applyFontSettings()
 {
     d->m_fontSettingsNeedsApply = false;
-    const FontSettings &fs = baseTextDocument()->fontSettings();
+    const FontSettings &fs = textDocument()->fontSettings();
     const QTextCharFormat textFormat = fs.toTextCharFormat(C_TEXT);
     const QTextCharFormat selectionFormat = fs.toTextCharFormat(C_SELECTION);
     const QTextCharFormat lineNumberFormat = fs.toTextCharFormat(C_LINE_NUMBER);
@@ -6042,7 +6042,7 @@ void BaseTextEditorWidget::setDisplaySettings(const DisplaySettings &ds)
     d->m_fileEncodingLabelAction->setVisible(ds.m_displayFileEncoding);
 
     if (d->m_displaySettings.m_visualizeWhitespace != ds.m_visualizeWhitespace) {
-        if (SyntaxHighlighter *highlighter = baseTextDocument()->syntaxHighlighter())
+        if (SyntaxHighlighter *highlighter = textDocument()->syntaxHighlighter())
             highlighter->rehighlight();
         QTextOption option =  document()->defaultTextOption();
         if (ds.m_visualizeWhitespace)
@@ -6236,7 +6236,7 @@ void BaseTextEditorWidget::circularPaste()
 
 void BaseTextEditorWidget::switchUtf8bom()
 {
-    baseTextDocument()->switchUtf8Bom();
+    textDocument()->switchUtf8Bom();
 }
 
 QMimeData *BaseTextEditorWidget::createMimeDataFromSelection() const
@@ -6493,7 +6493,7 @@ void BaseTextEditorWidget::appendStandardContextMenuActions(QMenu *menu)
     if (a && a->isEnabled())
         menu->addAction(a);
 
-    BaseTextDocument *doc = baseTextDocument();
+    BaseTextDocument *doc = textDocument();
     if (doc->codec()->name() == QByteArray("UTF-8") && doc->supportsUtf8Bom()) {
         a = Core::ActionManager::command(Constants::SWITCH_UTF8BOM)->action();
         if (a && a->isEnabled()) {
@@ -6521,14 +6521,14 @@ BaseTextEditor::~BaseTextEditor()
     delete d;
 }
 
-BaseTextDocument *BaseTextEditor::baseTextDocument()
+BaseTextDocument *BaseTextEditor::textDocument()
 {
-    return d->m_editorWidget->baseTextDocument();
+    return d->m_editorWidget->textDocument();
 }
 
 IDocument *BaseTextEditor::document()
 {
-    return d->m_editorWidget->baseTextDocument();
+    return d->m_editorWidget->textDocument();
 }
 
 QWidget *BaseTextEditor::toolBar()
@@ -6670,7 +6670,7 @@ void BaseTextEditorWidgetPrivate::updateCursorPosition()
     const int column = cursor.position() - block.position();
     m_cursorPositionLabel->show();
     m_cursorPositionLabel->setText(tr("Line: %1, Col: %2").arg(line)
-                                   .arg(q->baseTextDocument()->tabSettings().columnAt(block.text(),
+                                   .arg(q->textDocument()->tabSettings().columnAt(block.text(),
                                                                                    column)+1),
                                    tr("Line: 9999, Col: 999"));
     q->editor()->m_contextHelpId.clear();
@@ -7000,11 +7000,6 @@ bool BaseTextEditor::restoreState(const QByteArray &state)
     return d->m_editorWidget->restoreState(state);
 }
 
-BaseTextDocument *BaseTextEditor::textDocument()
-{
-    return qobject_cast<BaseTextDocument *>(document());
-}
-
 BaseTextEditor *BaseTextEditor::currentTextEditor()
 {
     return qobject_cast<BaseTextEditor *>(Core::EditorManager::currentEditor());
@@ -7023,8 +7018,8 @@ void BaseTextEditorWidget::configureMimeType(const QString &mimeType)
 void BaseTextEditorWidget::configureMimeType(const MimeType &mimeType)
 {
     Highlighter *highlighter = new Highlighter();
-    highlighter->setTabSettings(baseTextDocument()->tabSettings());
-    baseTextDocument()->setSyntaxHighlighter(highlighter);
+    highlighter->setTabSettings(textDocument()->tabSettings());
+    textDocument()->setSyntaxHighlighter(highlighter);
 
     setCodeFoldingSupported(false);
 
@@ -7033,7 +7028,7 @@ void BaseTextEditorWidget::configureMimeType(const MimeType &mimeType)
 
         setMimeTypeForHighlighter(highlighter, mimeType);
         const QString &type = mimeType.type();
-        baseTextDocument()->setMimeType(type);
+        textDocument()->setMimeType(type);
 
         QString definitionId = Manager::instance()->definitionIdByMimeType(type);
         if (definitionId.isEmpty())
@@ -7053,13 +7048,13 @@ void BaseTextEditorWidget::configureMimeType(const MimeType &mimeType)
                 setCodeFoldingSupported(true);
             }
         } else {
-            const QString &fileName = baseTextDocument()->filePath();
+            const QString &fileName = textDocument()->filePath();
             if (TextEditorSettings::highlighterSettings().isIgnoredFilePattern(fileName))
                 d->m_isMissingSyntaxDefinition = false;
         }
     }
 
-    baseTextDocument()->setFontSettings(TextEditorSettings::fontSettings());
+    textDocument()->setFontSettings(TextEditorSettings::fontSettings());
 
     emit configured(editor());
 }
@@ -7079,8 +7074,8 @@ void BaseTextEditorWidget::acceptMissingSyntaxDefinitionInfo()
 void BaseTextEditorWidget::configureMimeType()
 {
     MimeType mimeType;
-    if (baseTextDocument())
-        mimeType = MimeDatabase::findByFile(baseTextDocument()->filePath());
+    if (textDocument())
+        mimeType = MimeDatabase::findByFile(textDocument()->filePath());
     configureMimeType(mimeType);
 }
 
@@ -7091,9 +7086,9 @@ void BaseTextEditorWidget::setupAsPlainEditor()
     setMarksVisible(true);
     setLineSeparatorsAllowed(true);
 
-    baseTextDocument()->setMimeType(QLatin1String(TextEditor::Constants::C_TEXTEDITOR_MIMETYPE_TEXT));
+    textDocument()->setMimeType(QLatin1String(TextEditor::Constants::C_TEXTEDITOR_MIMETYPE_TEXT));
 
-    connect(baseTextDocument(), SIGNAL(filePathChanged(QString,QString)),
+    connect(textDocument(), SIGNAL(filePathChanged(QString,QString)),
             this, SLOT(configureMimeType()));
     connect(Manager::instance(), SIGNAL(mimeTypesRegistered()), this, SLOT(configureMimeType()));
 }
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index 9a6fc8793f..10108e2b8e 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -120,8 +120,6 @@ public:
     BaseTextEditor(BaseTextEditorWidget *editorWidget);
     ~BaseTextEditor();
 
-    virtual BaseTextDocument *textDocument();
-
     enum MarkRequestKind {
         BreakpointRequest,
         BookmarkRequest,
@@ -131,7 +129,7 @@ public:
     static BaseTextEditor *currentTextEditor();
 
     BaseTextEditorWidget *editorWidget() const;
-    BaseTextDocument *baseTextDocument();
+    BaseTextDocument *textDocument();
 
     // IEditor
     Core::IDocument *document();
@@ -218,7 +216,7 @@ public:
     BaseTextEditorWidget(BaseTextEditorWidget *other);
     ~BaseTextEditorWidget();
 
-    BaseTextDocument *baseTextDocument() const;
+    BaseTextDocument *textDocument() const;
 
     // IEditor
     virtual bool open(QString *errorString, const QString &fileName, const QString &realFileName);
diff --git a/src/plugins/texteditor/basetexteditor_test.cpp b/src/plugins/texteditor/basetexteditor_test.cpp
index 4339e674e1..bfb0fc2b73 100644
--- a/src/plugins/texteditor/basetexteditor_test.cpp
+++ b/src/plugins/texteditor/basetexteditor_test.cpp
@@ -147,7 +147,7 @@ void Internal::TextEditorPlugin::testBlockSelectionTransformation()
             editorWidget->lowercaseSelection();
             break;
         }
-        QCOMPARE(textEditor->baseTextDocument()->plainText(), transformedText);
+        QCOMPARE(textEditor->textDocument()->plainText(), transformedText);
     }
     Core::EditorManager::closeEditor(editor, false);
 }
@@ -362,7 +362,7 @@ void Internal::TextEditorPlugin::testBlockSelectionInsert()
         editorWidget->update();
         editorWidget->insertPlainText(insertText);
 
-        QCOMPARE(textEditor->baseTextDocument()->plainText(), transformedText);
+        QCOMPARE(textEditor->textDocument()->plainText(), transformedText);
     }
     Core::EditorManager::closeEditor(editor, false);
 }
@@ -440,7 +440,7 @@ void Internal::TextEditorPlugin::testBlockSelectionRemove()
         editorWidget->update();
         editorWidget->insertPlainText(QString());
 
-        QCOMPARE(textEditor->baseTextDocument()->plainText(), transformedText);
+        QCOMPARE(textEditor->textDocument()->plainText(), transformedText);
     }
     Core::EditorManager::closeEditor(editor, false);
 }
diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp
index a7c9d1b21d..d369638369 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.cpp
+++ b/src/plugins/texteditor/codeassist/codeassistant.cpp
@@ -185,7 +185,7 @@ void CodeAssistantPrivate::configure(BaseTextEditor *textEditor)
     filterEditorSpecificProviders(&m_quickFixProviders, m_textEditor->document()->id());
 
     m_textEditor->editorWidget()->installEventFilter(this);
-    connect(m_textEditor->baseTextDocument(),SIGNAL(mimeTypeChanged()),
+    connect(m_textEditor->textDocument(),SIGNAL(mimeTypeChanged()),
             m_q, SLOT(reconfigure()));
 }
 
diff --git a/src/plugins/texteditor/codestyleeditor.cpp b/src/plugins/texteditor/codestyleeditor.cpp
index 4cf58323b2..ebd5f493b5 100644
--- a/src/plugins/texteditor/codestyleeditor.cpp
+++ b/src/plugins/texteditor/codestyleeditor.cpp
@@ -54,7 +54,7 @@ CodeStyleEditor::CodeStyleEditor(ICodeStylePreferencesFactory *factory,
     CodeStyleSelectorWidget *selector = new CodeStyleSelectorWidget(factory, this);
     selector->setCodeStyle(codeStyle);
     m_preview = new SnippetEditorWidget(this);
-    m_preview->baseTextDocument()->setFontSettings(TextEditorSettings::fontSettings());
+    m_preview->textDocument()->setFontSettings(TextEditorSettings::fontSettings());
     DisplaySettings displaySettings = m_preview->displaySettings();
     displaySettings.m_visualizeWhitespace = true;
     m_preview->setDisplaySettings(displaySettings);
@@ -93,13 +93,13 @@ void CodeStyleEditor::updatePreview()
 {
     QTextDocument *doc = m_preview->document();
 
-    m_preview->baseTextDocument()->indenter()->invalidateCache(doc);
+    m_preview->textDocument()->indenter()->invalidateCache(doc);
 
     QTextBlock block = doc->firstBlock();
     QTextCursor tc = m_preview->textCursor();
     tc.beginEditBlock();
     while (block.isValid()) {
-        m_preview->baseTextDocument()->indenter()
+        m_preview->textDocument()->indenter()
                 ->indentBlock(doc, block, QChar::Null, m_codeStyle->currentTabSettings());
         block = block.next();
     }
diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp
index 1ba237d71e..0dab146b70 100644
--- a/src/plugins/texteditor/refactoringchanges.cpp
+++ b/src/plugins/texteditor/refactoringchanges.cpp
@@ -158,7 +158,7 @@ RefactoringFile::RefactoringFile(QTextDocument *document, const QString &fileNam
 { }
 
 RefactoringFile::RefactoringFile(BaseTextEditorWidget *editor)
-    : m_fileName(editor->baseTextDocument()->filePath())
+    : m_fileName(editor->textDocument()->filePath())
     , m_document(0)
     , m_editor(editor)
     , m_openEditor(false)
@@ -393,7 +393,7 @@ void RefactoringFile::indentOrReindent(void (RefactoringChangesData::*mf)(const
         QTextCursor selection(p.first.document());
         selection.setPosition(p.first.position());
         selection.setPosition(p.second.position(), QTextCursor::KeepAnchor);
-        ((*m_data).*(mf))(selection, m_fileName, m_editor ? m_editor->baseTextDocument() : 0);
+        ((*m_data).*(mf))(selection, m_fileName, m_editor ? m_editor->textDocument() : 0);
     }
 }
 
diff --git a/src/plugins/texteditor/snippets/snippeteditor.cpp b/src/plugins/texteditor/snippets/snippeteditor.cpp
index 140468be44..08ff2a88f2 100644
--- a/src/plugins/texteditor/snippets/snippeteditor.cpp
+++ b/src/plugins/texteditor/snippets/snippeteditor.cpp
@@ -52,7 +52,7 @@ SnippetEditor::SnippetEditor(SnippetEditorWidget *editor)
 SnippetEditorWidget::SnippetEditorWidget(QWidget *parent)
     : BaseTextEditorWidget(new BaseTextDocument, parent)
 {
-    baseTextDocument()->setId(Constants::SNIPPET_EDITOR_ID);
+    textDocument()->setId(Constants::SNIPPET_EDITOR_ID);
     setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
     setHighlightCurrentLine(false);
     setLineNumbersVisible(false);
@@ -61,7 +61,7 @@ SnippetEditorWidget::SnippetEditorWidget(QWidget *parent)
 
 void SnippetEditorWidget::setSyntaxHighlighter(TextEditor::SyntaxHighlighter *highlighter)
 {
-    baseTextDocument()->setSyntaxHighlighter(highlighter);
+    textDocument()->setSyntaxHighlighter(highlighter);
 }
 
 void SnippetEditorWidget::focusOutEvent(QFocusEvent *event)
diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
index 32e9c70f5f..b9f3d47eca 100644
--- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp
+++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp
@@ -336,7 +336,7 @@ void SnippetsSettingsPagePrivate::configureUi(QWidget *w)
     foreach (ISnippetProvider *provider, providers) {
         m_ui.groupCombo->addItem(provider->displayName(), provider->groupId());
         SnippetEditorWidget *snippetEditor = new SnippetEditorWidget(w);
-        snippetEditor->baseTextDocument()->setFontSettings(TextEditorSettings::fontSettings());
+        snippetEditor->textDocument()->setFontSettings(TextEditorSettings::fontSettings());
         provider->decorateEditor(snippetEditor);
         m_ui.snippetsEditorStack->insertWidget(m_ui.groupCombo->count() - 1, snippetEditor);
         connect(snippetEditor, SIGNAL(snippetContentChanged()), this, SLOT(setSnippetContent()));
@@ -537,7 +537,7 @@ void SnippetsSettingsPagePrivate::decorateEditors(const TextEditor::FontSettings
         ExtensionSystem::PluginManager::getObjects<ISnippetProvider>();
     for (int i = 0; i < m_ui.groupCombo->count(); ++i) {
         SnippetEditorWidget *snippetEditor = editorAt(i);
-        snippetEditor->baseTextDocument()->setFontSettings(fontSettings);
+        snippetEditor->textDocument()->setFontSettings(fontSettings);
         const QString &id = m_ui.groupCombo->itemData(i).toString();
         // This list should be quite short... Re-iterating over it is ok.
         foreach (const ISnippetProvider *provider, providers) {
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index 37b9aad28e..274a63a11a 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -337,7 +337,7 @@ void TextEditorSettings::initializeEditor(BaseTextEditorWidget *editor)
 {
     // Connect to settings change signals
     connect(m_instance, SIGNAL(fontSettingsChanged(TextEditor::FontSettings)),
-            editor->baseTextDocument(), SLOT(setFontSettings(TextEditor::FontSettings)));
+            editor->textDocument(), SLOT(setFontSettings(TextEditor::FontSettings)));
     connect(m_instance, SIGNAL(typingSettingsChanged(TextEditor::TypingSettings)),
             editor, SLOT(setTypingSettings(TextEditor::TypingSettings)));
     connect(m_instance, SIGNAL(storageSettingsChanged(TextEditor::StorageSettings)),
@@ -359,8 +359,8 @@ void TextEditorSettings::initializeEditor(BaseTextEditorWidget *editor)
             m_instance, SLOT(zoomResetRequested()));
 
     // Apply current settings
-    editor->baseTextDocument()->setFontSettings(fontSettings());
-    editor->baseTextDocument()->setTabSettings(codeStyle()->tabSettings()); // also set through code style ???
+    editor->textDocument()->setFontSettings(fontSettings());
+    editor->textDocument()->setTabSettings(codeStyle()->tabSettings()); // also set through code style ???
     editor->setTypingSettings(typingSettings());
     editor->setStorageSettings(storageSettings());
     editor->setBehaviorSettings(behaviorSettings());
diff --git a/src/plugins/vcsbase/basevcseditorfactory.cpp b/src/plugins/vcsbase/basevcseditorfactory.cpp
index baca25d3cc..39c1d0a43c 100644
--- a/src/plugins/vcsbase/basevcseditorfactory.cpp
+++ b/src/plugins/vcsbase/basevcseditorfactory.cpp
@@ -88,7 +88,7 @@ Core::IEditor *BaseVcsEditorFactory::createEditor()
         connect(vcsEditor, SIGNAL(describeRequested(QString,QString)), d->m_describeReceiver, d->m_describeSlot);
 
     if (!mimeTypes().isEmpty())
-        vcsEditor->baseTextDocument()->setMimeType(mimeTypes().front());
+        vcsEditor->textDocument()->setMimeType(mimeTypes().front());
 
     TextEditor::TextEditorSettings::initializeEditor(vcsEditor);
     return vcsEditor->editor();
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index 069eb76ce7..54d5a87a13 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -653,8 +653,8 @@ 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));
+    textDocument()->setId(type->id);
+    textDocument()->setMimeType(QLatin1String(d->m_parameters->mimeType));
 }
 
 void VcsBaseEditorWidget::setDiffFilePattern(const QRegExp &pattern)
@@ -711,7 +711,7 @@ void VcsBaseEditorWidget::init()
     if (hasDiff()) {
         DiffHighlighter *dh = new DiffHighlighter(d->m_diffFilePattern);
         setCodeFoldingSupported(true);
-        baseTextDocument()->setSyntaxHighlighter(dh);
+        textDocument()->setSyntaxHighlighter(dh);
     }
     TextEditor::TextEditorSettings::initializeEditor(this);
     // override revisions display (green or red bar on the left, marking changes):
@@ -734,12 +734,12 @@ void VcsBaseEditorWidget::setForceReadOnly(bool b)
 
 QString VcsBaseEditorWidget::source() const
 {
-    return VcsBasePlugin::source(baseTextDocument());
+    return VcsBasePlugin::source(textDocument());
 }
 
 void VcsBaseEditorWidget::setSource(const  QString &source)
 {
-    VcsBasePlugin::setSource(baseTextDocument(), source);
+    VcsBasePlugin::setSource(textDocument(), source);
 }
 
 QString VcsBaseEditorWidget::annotateRevisionTextFormat() const
@@ -794,13 +794,13 @@ void VcsBaseEditorWidget::setWorkingDirectory(const QString &wd)
 
 QTextCodec *VcsBaseEditorWidget::codec() const
 {
-    return const_cast<QTextCodec *>(baseTextDocument()->codec());
+    return const_cast<QTextCodec *>(textDocument()->codec());
 }
 
 void VcsBaseEditorWidget::setCodec(QTextCodec *c)
 {
     if (c)
-        baseTextDocument()->setCodec(c);
+        textDocument()->setCodec(c);
     else
         qWarning("%s: Attempt to set 0 codec.", Q_FUNC_INFO);
 }
@@ -1054,11 +1054,11 @@ void VcsBaseEditorWidget::slotActivateAnnotation()
 
     disconnect(this, SIGNAL(textChanged()), this, SLOT(slotActivateAnnotation()));
 
-    if (BaseAnnotationHighlighter *ah = qobject_cast<BaseAnnotationHighlighter *>(baseTextDocument()->syntaxHighlighter())) {
+    if (BaseAnnotationHighlighter *ah = qobject_cast<BaseAnnotationHighlighter *>(textDocument()->syntaxHighlighter())) {
         ah->setChangeNumbers(changes);
         ah->rehighlight();
     } else {
-        baseTextDocument()->setSyntaxHighlighter(createAnnotationHighlighter(changes));
+        textDocument()->setSyntaxHighlighter(createAnnotationHighlighter(changes));
     }
 }
 
@@ -1175,7 +1175,7 @@ DiffChunk VcsBaseEditorWidget::diffChunk(QTextCursor cursor) const
             unicode += QLatin1Char('\n');
         }
     }
-    const QTextCodec *cd = baseTextDocument()->codec();
+    const QTextCodec *cd = textDocument()->codec();
     rc.chunk = cd ? cd->fromUnicode(unicode) : unicode.toLocal8Bit();
     rc.header = cd ? cd->fromUnicode(header) : header.toLocal8Bit();
     return rc;
@@ -1187,7 +1187,7 @@ void VcsBaseEditorWidget::reportCommandFinished(bool ok, int exitCode, const QVa
     Q_UNUSED(data);
 
     if (!ok)
-        baseTextDocument()->setPlainText(tr("Failed to retrieve data."));
+        textDocument()->setPlainText(tr("Failed to retrieve data."));
 }
 
 const VcsBaseEditorParameters *VcsBaseEditorWidget::findType(const VcsBaseEditorParameters *array,
@@ -1584,7 +1584,7 @@ void VcsBase::VcsBaseEditorWidget::testLogResolving(QByteArray &data,
                                                     const QByteArray &entry2)
 {
     init();
-    baseTextDocument()->setPlainText(QLatin1String(data));
+    textDocument()->setPlainText(QLatin1String(data));
     QCOMPARE(d->entriesComboBox()->itemText(0), QString::fromLatin1(entry1));
     QCOMPARE(d->entriesComboBox()->itemText(1), QString::fromLatin1(entry2));
 }