Rename {Core,TextEditor},{Base,}TextDocument classes

First step of some more 'Base' removal in TextEditor.
s/Core::TextDocument/Core::BaseTextDocument/
s/TextEditor::BaseTextDocument/TextEditor::TextDocument/

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

17 files changed, 121 insertions, 121 deletions

diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp
index 1fee2bca11..9b303350a0 100644
--- a/src/plugins/texteditor/basefilefind.cpp
+++ b/src/plugins/texteditor/basefilefind.cpp
@@ -174,12 +174,12 @@ void BaseFileFind::runSearch(Core::SearchResult *search)
         watcher->setFuture(Utils::findInFilesRegExp(parameters.text,
             files(parameters.nameFilters, parameters.additionalParameters),
             textDocumentFlagsForFindFlags(parameters.flags),
-            BaseTextDocument::openedTextDocumentContents()));
+            TextDocument::openedTextDocumentContents()));
     } else {
         watcher->setFuture(Utils::findInFiles(parameters.text,
             files(parameters.nameFilters, parameters.additionalParameters),
             textDocumentFlagsForFindFlags(parameters.flags),
-            BaseTextDocument::openedTextDocumentContents()));
+            TextDocument::openedTextDocumentContents()));
     }
     FutureProgress *progress =
         ProgressManager::addTask(watcher->future(), tr("Searching"), Constants::TASK_SEARCH);
diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/basetextdocument.cpp
index f19f077889..a49219342a 100644
--- a/src/plugins/texteditor/basetextdocument.cpp
+++ b/src/plugins/texteditor/basetextdocument.cpp
@@ -70,10 +70,10 @@ using namespace Core;
 
 namespace TextEditor {
 
-class BaseTextDocumentPrivate
+class TextDocumentPrivate
 {
 public:
-    BaseTextDocumentPrivate() :
+    TextDocumentPrivate() :
         m_fontSettingsNeedsApply(false),
         m_highlighter(0),
         m_indenter(new Indenter),
@@ -105,7 +105,7 @@ public:
     TextMarks m_marksCache; // Marks not owned
 };
 
-QTextCursor BaseTextDocumentPrivate::indentOrUnindent(const QTextCursor &textCursor, bool doIndent)
+QTextCursor TextDocumentPrivate::indentOrUnindent(const QTextCursor &textCursor, bool doIndent)
 {
     QTextCursor cursor = textCursor;
     cursor.beginEditBlock();
@@ -157,7 +157,7 @@ QTextCursor BaseTextDocumentPrivate::indentOrUnindent(const QTextCursor &textCur
     return cursor;
 }
 
-void BaseTextDocumentPrivate::resetRevisions()
+void TextDocumentPrivate::resetRevisions()
 {
     BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(m_document.documentLayout());
     QTC_ASSERT(documentLayout, return);
@@ -167,7 +167,7 @@ void BaseTextDocumentPrivate::resetRevisions()
         block.setRevision(documentLayout->lastSaveRevision);
 }
 
-void BaseTextDocumentPrivate::updateRevisions()
+void TextDocumentPrivate::updateRevisions()
 {
     BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(m_document.documentLayout());
     QTC_ASSERT(documentLayout, return);
@@ -190,8 +190,8 @@ void BaseTextDocumentPrivate::updateRevisions()
 //
 ///////////////////////////////////////////////////////////////////////
 
-BaseTextDocument::BaseTextDocument(Id id)
-    : d(new BaseTextDocumentPrivate)
+TextDocument::TextDocument(Id id)
+    : d(new TextDocumentPrivate)
 {
     QObject::connect(&d->m_document, &QTextDocument::modificationChanged, [this](bool modified) {
         // we only want to update the block revisions when going back to the saved version,
@@ -201,7 +201,7 @@ BaseTextDocument::BaseTextDocument(Id id)
         emit changed();
     });
 
-    QObject::connect(&d->m_document, &QTextDocument::contentsChanged, this, &BaseTextDocument::contentsChanged);
+    QObject::connect(&d->m_document, &QTextDocument::contentsChanged, this, &TextDocument::contentsChanged);
 
     // set new document layout
     QTextOption opt = d->m_document.defaultTextOption();
@@ -216,16 +216,16 @@ BaseTextDocument::BaseTextDocument(Id id)
         setId(id);
 }
 
-BaseTextDocument::~BaseTextDocument()
+TextDocument::~TextDocument()
 {
     delete d;
 }
 
-QMap<QString, QString> BaseTextDocument::openedTextDocumentContents()
+QMap<QString, QString> TextDocument::openedTextDocumentContents()
 {
     QMap<QString, QString> workingCopy;
     foreach (IDocument *document, DocumentModel::openedDocuments()) {
-        BaseTextDocument *textEditorDocument = qobject_cast<BaseTextDocument *>(document);
+        TextDocument *textEditorDocument = qobject_cast<TextDocument *>(document);
         if (!textEditorDocument)
             continue;
         QString fileName = textEditorDocument->filePath();
@@ -234,11 +234,11 @@ QMap<QString, QString> BaseTextDocument::openedTextDocumentContents()
     return workingCopy;
 }
 
-QMap<QString, QTextCodec *> BaseTextDocument::openedTextDocumentEncodings()
+QMap<QString, QTextCodec *> TextDocument::openedTextDocumentEncodings()
 {
     QMap<QString, QTextCodec *> workingCopy;
     foreach (IDocument *document, DocumentModel::openedDocuments()) {
-        BaseTextDocument *textEditorDocument = qobject_cast<BaseTextDocument *>(document);
+        TextDocument *textEditorDocument = qobject_cast<TextDocument *>(document);
         if (!textEditorDocument)
             continue;
         QString fileName = textEditorDocument->filePath();
@@ -247,42 +247,42 @@ QMap<QString, QTextCodec *> BaseTextDocument::openedTextDocumentEncodings()
     return workingCopy;
 }
 
-QString BaseTextDocument::plainText() const
+QString TextDocument::plainText() const
 {
     return document()->toPlainText();
 }
 
-QString BaseTextDocument::textAt(int pos, int length) const
+QString TextDocument::textAt(int pos, int length) const
 {
     return Convenience::textAt(QTextCursor(document()), pos, length);
 }
 
-QChar BaseTextDocument::characterAt(int pos) const
+QChar TextDocument::characterAt(int pos) const
 {
     return document()->characterAt(pos);
 }
 
-void BaseTextDocument::setTypingSettings(const TypingSettings &typingSettings)
+void TextDocument::setTypingSettings(const TypingSettings &typingSettings)
 {
     d->m_typingSettings = typingSettings;
 }
 
-void BaseTextDocument::setStorageSettings(const StorageSettings &storageSettings)
+void TextDocument::setStorageSettings(const StorageSettings &storageSettings)
 {
     d->m_storageSettings = storageSettings;
 }
 
-const TypingSettings &BaseTextDocument::typingSettings() const
+const TypingSettings &TextDocument::typingSettings() const
 {
     return d->m_typingSettings;
 }
 
-const StorageSettings &BaseTextDocument::storageSettings() const
+const StorageSettings &TextDocument::storageSettings() const
 {
     return d->m_storageSettings;
 }
 
-void BaseTextDocument::setTabSettings(const TabSettings &tabSettings)
+void TextDocument::setTabSettings(const TabSettings &tabSettings)
 {
     if (tabSettings == d->m_tabSettings)
         return;
@@ -294,12 +294,12 @@ void BaseTextDocument::setTabSettings(const TabSettings &tabSettings)
     emit tabSettingsChanged();
 }
 
-const TabSettings &BaseTextDocument::tabSettings() const
+const TabSettings &TextDocument::tabSettings() const
 {
     return d->m_tabSettings;
 }
 
-void BaseTextDocument::setFontSettings(const FontSettings &fontSettings)
+void TextDocument::setFontSettings(const FontSettings &fontSettings)
 {
     if (fontSettings == d->m_fontSettings)
         return;
@@ -308,13 +308,13 @@ void BaseTextDocument::setFontSettings(const FontSettings &fontSettings)
     emit fontSettingsChanged();
 }
 
-void BaseTextDocument::triggerPendingUpdates()
+void TextDocument::triggerPendingUpdates()
 {
     if (d->m_fontSettingsNeedsApply)
         applyFontSettings();
 }
 
-void BaseTextDocument::applyFontSettings()
+void TextDocument::applyFontSettings()
 {
     d->m_fontSettingsNeedsApply = false;
     if (d->m_highlighter) {
@@ -323,42 +323,42 @@ void BaseTextDocument::applyFontSettings()
     }
 }
 
-const FontSettings &BaseTextDocument::fontSettings() const
+const FontSettings &TextDocument::fontSettings() const
 {
     return d->m_fontSettings;
 }
 
-void BaseTextDocument::setExtraEncodingSettings(const ExtraEncodingSettings &extraEncodingSettings)
+void TextDocument::setExtraEncodingSettings(const ExtraEncodingSettings &extraEncodingSettings)
 {
     d->m_extraEncodingSettings = extraEncodingSettings;
 }
 
-void BaseTextDocument::autoIndent(const QTextCursor &cursor, QChar typedChar)
+void TextDocument::autoIndent(const QTextCursor &cursor, QChar typedChar)
 {
     d->m_indenter->indent(&d->m_document, cursor, typedChar, d->m_tabSettings);
 }
 
-void BaseTextDocument::autoReindent(const QTextCursor &cursor)
+void TextDocument::autoReindent(const QTextCursor &cursor)
 {
     d->m_indenter->reindent(&d->m_document, cursor, d->m_tabSettings);
 }
 
-QTextCursor BaseTextDocument::indent(const QTextCursor &cursor)
+QTextCursor TextDocument::indent(const QTextCursor &cursor)
 {
     return d->indentOrUnindent(cursor, true);
 }
 
-QTextCursor BaseTextDocument::unindent(const QTextCursor &cursor)
+QTextCursor TextDocument::unindent(const QTextCursor &cursor)
 {
     return d->indentOrUnindent(cursor, false);
 }
 
-const ExtraEncodingSettings &BaseTextDocument::extraEncodingSettings() const
+const ExtraEncodingSettings &TextDocument::extraEncodingSettings() const
 {
     return d->m_extraEncodingSettings;
 }
 
-void BaseTextDocument::setIndenter(Indenter *indenter)
+void TextDocument::setIndenter(Indenter *indenter)
 {
     // clear out existing code formatter data
     for (QTextBlock it = document()->begin(); it.isValid(); it = it.next()) {
@@ -369,42 +369,42 @@ void BaseTextDocument::setIndenter(Indenter *indenter)
     d->m_indenter.reset(indenter);
 }
 
-Indenter *BaseTextDocument::indenter() const
+Indenter *TextDocument::indenter() const
 {
     return d->m_indenter.data();
 }
 
-bool BaseTextDocument::isSaveAsAllowed() const
+bool TextDocument::isSaveAsAllowed() const
 {
     return true;
 }
 
-QString BaseTextDocument::defaultPath() const
+QString TextDocument::defaultPath() const
 {
     return d->m_defaultPath;
 }
 
-QString BaseTextDocument::suggestedFileName() const
+QString TextDocument::suggestedFileName() const
 {
     return d->m_suggestedFileName;
 }
 
-void BaseTextDocument::setDefaultPath(const QString &defaultPath)
+void TextDocument::setDefaultPath(const QString &defaultPath)
 {
     d->m_defaultPath = defaultPath;
 }
 
-void BaseTextDocument::setSuggestedFileName(const QString &suggestedFileName)
+void TextDocument::setSuggestedFileName(const QString &suggestedFileName)
 {
     d->m_suggestedFileName = suggestedFileName;
 }
 
-QTextDocument *BaseTextDocument::document() const
+QTextDocument *TextDocument::document() const
 {
     return &d->m_document;
 }
 
-SyntaxHighlighter *BaseTextDocument::syntaxHighlighter() const
+SyntaxHighlighter *TextDocument::syntaxHighlighter() const
 {
     return d->m_highlighter;
 }
@@ -416,7 +416,7 @@ SyntaxHighlighter *BaseTextDocument::syntaxHighlighter() const
  * If \a autoSave is true, the cursor will be restored and some signals suppressed
  * and we do not clean up the text file (cleanWhitespace(), ensureFinalNewLine()).
  */
-bool BaseTextDocument::save(QString *errorString, const QString &saveFileName, bool autoSave)
+bool TextDocument::save(QString *errorString, const QString &saveFileName, bool autoSave)
 {
     QTextCursor cursor(&d->m_document);
 
@@ -501,17 +501,17 @@ bool BaseTextDocument::save(QString *errorString, const QString &saveFileName, b
     return true;
 }
 
-bool BaseTextDocument::setContents(const QByteArray &contents)
+bool TextDocument::setContents(const QByteArray &contents)
 {
     return setPlainText(QString::fromUtf8(contents));
 }
 
-bool BaseTextDocument::shouldAutoSave() const
+bool TextDocument::shouldAutoSave() const
 {
     return d->m_autoSaveRevision != d->m_document.revision();
 }
 
-void BaseTextDocument::setFilePath(const QString &newName)
+void TextDocument::setFilePath(const QString &newName)
 {
     if (newName == filePath())
         return;
@@ -519,19 +519,19 @@ void BaseTextDocument::setFilePath(const QString &newName)
     IDocument::setFilePath(QDir::cleanPath(fi.absoluteFilePath()));
 }
 
-bool BaseTextDocument::isFileReadOnly() const
+bool TextDocument::isFileReadOnly() const
 {
     if (filePath().isEmpty()) //have no corresponding file, so editing is ok
         return false;
     return d->m_fileIsReadOnly;
 }
 
-bool BaseTextDocument::isModified() const
+bool TextDocument::isModified() const
 {
     return d->m_document.isModified();
 }
 
-void BaseTextDocument::checkPermissions()
+void TextDocument::checkPermissions()
 {
     bool previousReadOnly = d->m_fileIsReadOnly;
     if (!filePath().isEmpty()) {
@@ -544,7 +544,7 @@ void BaseTextDocument::checkPermissions()
         emit changed();
 }
 
-bool BaseTextDocument::open(QString *errorString, const QString &fileName, const QString &realFileName)
+bool TextDocument::open(QString *errorString, const QString &fileName, const QString &realFileName)
 {
     QStringList content;
 
@@ -591,14 +591,14 @@ bool BaseTextDocument::open(QString *errorString, const QString &fileName, const
            || readResult == Utils::TextFileFormat::ReadEncodingError;
 }
 
-bool BaseTextDocument::reload(QString *errorString, QTextCodec *codec)
+bool TextDocument::reload(QString *errorString, QTextCodec *codec)
 {
     QTC_ASSERT(codec, return false);
     setCodec(codec);
     return reload(errorString);
 }
 
-bool BaseTextDocument::reload(QString *errorString)
+bool TextDocument::reload(QString *errorString)
 {
     emit aboutToReload();
     BaseTextDocumentLayout *documentLayout =
@@ -615,7 +615,7 @@ bool BaseTextDocument::reload(QString *errorString)
     return success;
 }
 
-bool BaseTextDocument::setPlainText(const QString &text)
+bool TextDocument::setPlainText(const QString &text)
 {
     if (text.size() > EditorManager::maxTextFileSize()) {
         document()->setPlainText(BaseTextEditorWidget::msgTextTooLarge(text.size()));
@@ -629,7 +629,7 @@ bool BaseTextDocument::setPlainText(const QString &text)
     return true;
 }
 
-bool BaseTextDocument::reload(QString *errorString, ReloadFlag flag, ChangeType type)
+bool TextDocument::reload(QString *errorString, ReloadFlag flag, ChangeType type)
 {
     if (flag == FlagIgnore)
         return true;
@@ -641,7 +641,7 @@ bool BaseTextDocument::reload(QString *errorString, ReloadFlag flag, ChangeType
     }
 }
 
-void BaseTextDocument::setSyntaxHighlighter(SyntaxHighlighter *highlighter)
+void TextDocument::setSyntaxHighlighter(SyntaxHighlighter *highlighter)
 {
     if (d->m_highlighter)
         delete d->m_highlighter;
@@ -650,7 +650,7 @@ void BaseTextDocument::setSyntaxHighlighter(SyntaxHighlighter *highlighter)
     d->m_highlighter->setDocument(&d->m_document);
 }
 
-void BaseTextDocument::cleanWhitespace(const QTextCursor &cursor)
+void TextDocument::cleanWhitespace(const QTextCursor &cursor)
 {
     bool hasSelection = cursor.hasSelection();
     QTextCursor copyCursor = cursor;
@@ -662,7 +662,7 @@ void BaseTextDocument::cleanWhitespace(const QTextCursor &cursor)
     copyCursor.endEditBlock();
 }
 
-void BaseTextDocument::cleanWhitespace(QTextCursor &cursor, bool cleanIndentation, bool inEntireDocument)
+void TextDocument::cleanWhitespace(QTextCursor &cursor, bool cleanIndentation, bool inEntireDocument)
 {
     BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(d->m_document.documentLayout());
     Q_ASSERT(cursor.visualNavigation() == false);
@@ -697,7 +697,7 @@ void BaseTextDocument::cleanWhitespace(QTextCursor &cursor, bool cleanIndentatio
     }
 }
 
-void BaseTextDocument::ensureFinalNewLine(QTextCursor& cursor)
+void TextDocument::ensureFinalNewLine(QTextCursor& cursor)
 {
     cursor.movePosition(QTextCursor::End, QTextCursor::MoveAnchor);
     bool emptyFile = !cursor.movePosition(QTextCursor::PreviousCharacter, QTextCursor::KeepAnchor);
@@ -709,12 +709,12 @@ void BaseTextDocument::ensureFinalNewLine(QTextCursor& cursor)
     }
 }
 
-TextMarks BaseTextDocument::marks() const
+TextMarks TextDocument::marks() const
 {
     return d->m_marksCache;
 }
 
-bool BaseTextDocument::addMark(TextMark *mark)
+bool TextDocument::addMark(TextMark *mark)
 {
     if (mark->baseTextDocument())
         return false;
@@ -748,7 +748,7 @@ bool BaseTextDocument::addMark(TextMark *mark)
     return false;
 }
 
-TextMarks BaseTextDocument::marksAt(int line) const
+TextMarks TextDocument::marksAt(int line) const
 {
     QTC_ASSERT(line >= 1, return TextMarks());
     int blockNumber = line - 1;
@@ -761,7 +761,7 @@ TextMarks BaseTextDocument::marksAt(int line) const
     return TextMarks();
 }
 
-void BaseTextDocument::removeMarkFromMarksCache(TextMark *mark)
+void TextDocument::removeMarkFromMarksCache(TextMark *mark)
 {
     auto documentLayout = qobject_cast<BaseTextDocumentLayout*>(d->m_document.documentLayout());
     QTC_ASSERT(documentLayout, return);
@@ -801,7 +801,7 @@ void BaseTextDocument::removeMarkFromMarksCache(TextMark *mark)
     }
 }
 
-void BaseTextDocument::removeMark(TextMark *mark)
+void TextDocument::removeMark(TextMark *mark)
 {
     QTextBlock block = d->m_document.findBlockByNumber(mark->lineNumber() - 1);
     if (TextBlockUserData *data = static_cast<TextBlockUserData *>(block.userData())) {
@@ -813,7 +813,7 @@ void BaseTextDocument::removeMark(TextMark *mark)
     mark->setBaseTextDocument(0);
 }
 
-void BaseTextDocument::updateMark(TextMark *mark)
+void TextDocument::updateMark(TextMark *mark)
 {
     Q_UNUSED(mark)
     auto documentLayout = qobject_cast<BaseTextDocumentLayout*>(d->m_document.documentLayout());
@@ -821,7 +821,7 @@ void BaseTextDocument::updateMark(TextMark *mark)
     documentLayout->requestUpdate();
 }
 
-void BaseTextDocument::moveMark(TextMark *mark, int previousLine)
+void TextDocument::moveMark(TextMark *mark, int previousLine)
 {
     QTextBlock block = d->m_document.findBlockByNumber(previousLine - 1);
     if (TextBlockUserData *data = BaseTextDocumentLayout::testUserData(block)) {
diff --git a/src/plugins/texteditor/basetextdocument.h b/src/plugins/texteditor/basetextdocument.h
index 553a7fb24f..55ba153982 100644
--- a/src/plugins/texteditor/basetextdocument.h
+++ b/src/plugins/texteditor/basetextdocument.h
@@ -48,25 +48,25 @@ QT_END_NAMESPACE
 
 namespace TextEditor {
 
-class BaseTextDocumentPrivate;
 class ExtraEncodingSettings;
 class FontSettings;
 class Indenter;
 class StorageSettings;
 class SyntaxHighlighter;
 class TabSettings;
+class TextDocumentPrivate;
 class TextMark;
 class TypingSettings;
 
 typedef QList<TextMark *> TextMarks;
 
-class TEXTEDITOR_EXPORT BaseTextDocument : public Core::TextDocument
+class TEXTEDITOR_EXPORT TextDocument : public Core::BaseTextDocument
 {
     Q_OBJECT
 
 public:
-    explicit BaseTextDocument(Core::Id id = Core::Id());
-    virtual ~BaseTextDocument();
+    explicit TextDocument(Core::Id id = Core::Id());
+    virtual ~TextDocument();
 
     static QMap<QString, QString> openedTextDocumentContents();
     static QMap<QString, QTextCodec *> openedTextDocumentEncodings();
@@ -98,7 +98,7 @@ public:
     void removeMark(TextMark *mark);
     void updateMark(TextMark *mark);
     void moveMark(TextMark *mark, int previousLine);
-    void removeMarkFromMarksCache(TextEditor::TextMark *mark);
+    void removeMarkFromMarksCache(TextMark *mark);
 
     // IDocument implementation.
     bool save(QString *errorString, const QString &fileName, bool autoSave);
@@ -146,10 +146,10 @@ private:
     void cleanWhitespace(QTextCursor &cursor, bool cleanIndentation, bool inEntireDocument);
     void ensureFinalNewLine(QTextCursor &cursor);
 
-    BaseTextDocumentPrivate *d;
+    TextDocumentPrivate *d;
 };
 
-typedef QSharedPointer<BaseTextDocument> BaseTextDocumentPtr;
+typedef QSharedPointer<TextDocument> BaseTextDocumentPtr;
 
 } // namespace TextEditor
 
diff --git a/src/plugins/texteditor/basetextdocumentlayout.cpp b/src/plugins/texteditor/basetextdocumentlayout.cpp
index 09d6104623..012193303a 100644
--- a/src/plugins/texteditor/basetextdocumentlayout.cpp
+++ b/src/plugins/texteditor/basetextdocumentlayout.cpp
@@ -591,7 +591,7 @@ TextMarks BaseTextDocumentLayout::documentClosing()
     return marks;
 }
 
-void BaseTextDocumentLayout::documentReloaded(TextMarks marks, BaseTextDocument *baseTextDocument)
+void BaseTextDocumentLayout::documentReloaded(TextMarks marks, TextDocument *baseTextDocument)
 {
     foreach (TextMark *mark, marks) {
         int blockNumber = mark->lineNumber() - 1;
diff --git a/src/plugins/texteditor/basetextdocumentlayout.h b/src/plugins/texteditor/basetextdocumentlayout.h
index cf7e85066f..928c55d66b 100644
--- a/src/plugins/texteditor/basetextdocumentlayout.h
+++ b/src/plugins/texteditor/basetextdocumentlayout.h
@@ -218,7 +218,7 @@ public:
     QSizeF documentSize() const;
 
     TextMarks documentClosing();
-    void documentReloaded(TextMarks marks, BaseTextDocument *baseextDocument);
+    void documentReloaded(TextMarks marks, TextDocument *baseextDocument);
     void updateMarksLineNumber();
     void updateMarksBlock(const QTextBlock &block);
 
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 0180d5e938..494a9fc6f7 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -251,7 +251,7 @@ public:
     void updateCannotDecodeInfo();
     void collectToCircularClipboard();
 
-    void ctor(const QSharedPointer<BaseTextDocument> &doc);
+    void ctor(const QSharedPointer<TextDocument> &doc);
     void handleHomeKey(bool anchor);
     void handleBackspaceKey();
     void moveLineUpDown(bool up);
@@ -324,7 +324,7 @@ public:
     bool m_contentsChanged;
     bool m_lastCursorChangeWasInteresting;
 
-    QSharedPointer<BaseTextDocument> m_document;
+    QSharedPointer<TextDocument> m_document;
     QByteArray m_tempState;
     QByteArray m_tempNavigationState;
 
@@ -590,12 +590,12 @@ BaseTextEditorWidget::BaseTextEditorWidget(QWidget *parent)
     d = new BaseTextEditorWidgetPrivate(this);
 }
 
-void BaseTextEditorWidget::setTextDocument(const QSharedPointer<BaseTextDocument> &doc)
+void BaseTextEditorWidget::setTextDocument(const QSharedPointer<TextDocument> &doc)
 {
     d->ctor(doc);
 }
 
-void BaseTextEditorWidgetPrivate::ctor(const QSharedPointer<BaseTextDocument> &doc)
+void BaseTextEditorWidgetPrivate::ctor(const QSharedPointer<TextDocument> &doc)
 {
     q->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
 
@@ -889,7 +889,7 @@ int BaseTextEditorWidgetPrivate::visualIndent(const QTextBlock &block) const
 
 void BaseTextEditorWidget::selectEncoding()
 {
-    BaseTextDocument *doc = d->m_document.data();
+    TextDocument *doc = d->m_document.data();
     CodecSelector codecSelector(this, doc);
 
     switch (codecSelector.exec()) {
@@ -999,7 +999,7 @@ void BaseTextEditorWidgetPrivate::foldLicenseHeader()
     }
 }
 
-BaseTextDocument *BaseTextEditorWidget::textDocument() const
+TextDocument *BaseTextEditorWidget::textDocument() const
 {
     return d->m_document.data();
 }
@@ -2844,16 +2844,16 @@ void BaseTextEditorWidgetPrivate::setupDocumentSignals()
     QObject::connect(doc, &QTextDocument::contentsChange,
                      this, &BaseTextEditorWidgetPrivate::editorContentsChange);
 
-    QObject::connect(m_document.data(), &BaseTextDocument::aboutToReload,
+    QObject::connect(m_document.data(), &TextDocument::aboutToReload,
                      this, &BaseTextEditorWidgetPrivate::documentAboutToBeReloaded);
 
-    QObject::connect(m_document.data(), &BaseTextDocument::reloadFinished,
+    QObject::connect(m_document.data(), &TextDocument::reloadFinished,
                      this, &BaseTextEditorWidgetPrivate::documentReloadFinished);
 
-    QObject::connect(m_document.data(), &BaseTextDocument::tabSettingsChanged,
+    QObject::connect(m_document.data(), &TextDocument::tabSettingsChanged,
                      this, &BaseTextEditorWidgetPrivate::updateTabStops);
 
-    QObject::connect(m_document.data(), &BaseTextDocument::fontSettingsChanged,
+    QObject::connect(m_document.data(), &TextDocument::fontSettingsChanged,
                      this, &BaseTextEditorWidgetPrivate::applyFontSettingsDelayed);
 
     slotUpdateExtraAreaWidth();
@@ -2862,7 +2862,7 @@ void BaseTextEditorWidgetPrivate::setupDocumentSignals()
 
     // Connect to settings change signals
     connect(settings, &TextEditorSettings::fontSettingsChanged,
-            m_document.data(), &BaseTextDocument::setFontSettings);
+            m_document.data(), &TextDocument::setFontSettings);
     connect(settings, &TextEditorSettings::typingSettingsChanged,
             q, &BaseTextEditorWidget::setTypingSettings);
     connect(settings, &TextEditorSettings::storageSettingsChanged,
@@ -6531,7 +6531,7 @@ QColor BaseTextEditorWidget::replacementPenColor(int blockNumber) const
 
 void BaseTextEditorWidget::setupFallBackEditor(Id id)
 {
-    BaseTextDocumentPtr doc(new BaseTextDocument(id));
+    BaseTextDocumentPtr doc(new TextDocument(id));
     doc->setFontSettings(TextEditorSettings::fontSettings());
     setTextDocument(doc);
 }
@@ -6553,7 +6553,7 @@ void BaseTextEditorWidget::appendStandardContextMenuActions(QMenu *menu)
     if (a && a->isEnabled())
         menu->addAction(a);
 
-    BaseTextDocument *doc = textDocument();
+    TextDocument *doc = textDocument();
     if (doc->codec()->name() == QByteArray("UTF-8") && doc->supportsUtf8Bom()) {
         a = ActionManager::command(Constants::SWITCH_UTF8BOM)->action();
         if (a && a->isEnabled()) {
@@ -6578,7 +6578,7 @@ BaseTextEditor::~BaseTextEditor()
     delete d;
 }
 
-BaseTextDocument *BaseTextEditor::textDocument() const
+TextDocument *BaseTextEditor::textDocument() const
 {
     BaseTextEditorWidget *widget = editorWidget();
     QTC_CHECK(!widget->d->m_document.isNull());
@@ -6782,18 +6782,18 @@ void BaseTextBlockSelection::clear()
 }
 
 // returns a cursor which always has the complete selection
-QTextCursor BaseTextBlockSelection::selection(const BaseTextDocument *baseTextDocument) const
+QTextCursor BaseTextBlockSelection::selection(const TextDocument *baseTextDocument) const
 {
     return cursor(baseTextDocument, true);
 }
 
 // returns a cursor which always has the correct position and anchor
-QTextCursor BaseTextBlockSelection::cursor(const BaseTextDocument *baseTextDocument) const
+QTextCursor BaseTextBlockSelection::cursor(const TextDocument *baseTextDocument) const
 {
     return cursor(baseTextDocument, false);
 }
 
-QTextCursor BaseTextBlockSelection::cursor(const BaseTextDocument *baseTextDocument,
+QTextCursor BaseTextBlockSelection::cursor(const TextDocument *baseTextDocument,
                                            bool fullSelection) const
 {
     if (!baseTextDocument)
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index f6357fc84a..0aac1f39eb 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -138,7 +138,7 @@ public:
     static BaseTextEditor *currentTextEditor();
 
     BaseTextEditorWidget *editorWidget() const;
-    BaseTextDocument *textDocument() const;
+    TextDocument *textDocument() const;
 
     // Some convenience text access
     QTextDocument *qdocument() const;
@@ -217,7 +217,7 @@ public:
     ~BaseTextEditorWidget();
 
     void setTextDocument(const BaseTextDocumentPtr &doc);
-    BaseTextDocument *textDocument() const;
+    TextDocument *textDocument() const;
     BaseTextDocumentPtr textDocumentPtr() const;
 
     // IEditor
@@ -625,7 +625,7 @@ public:
     BaseTextEditorFactory(QObject *parent = 0);
 
     typedef std::function<BaseTextEditor *()> EditorCreator;
-    typedef std::function<BaseTextDocument *()> DocumentCreator;
+    typedef std::function<TextDocument *()> DocumentCreator;
     typedef std::function<BaseTextEditorWidget *()> EditorWidgetCreator;
     typedef std::function<SyntaxHighlighter *()> SyntaxHighLighterCreator;
     typedef std::function<Indenter *()> IndenterCreator;
diff --git a/src/plugins/texteditor/basetexteditor_p.h b/src/plugins/texteditor/basetexteditor_p.h
index f390ac38fe..9028cc02f7 100644
--- a/src/plugins/texteditor/basetexteditor_p.h
+++ b/src/plugins/texteditor/basetexteditor_p.h
@@ -49,7 +49,7 @@
 
 namespace TextEditor {
 
-class BaseTextDocument;
+class TextDocument;
 
 namespace Internal {
 class TextEditorOverlay;
@@ -64,8 +64,8 @@ public:
     BaseTextBlockSelection(const BaseTextBlockSelection &other);
 
     void clear();
-    QTextCursor selection(const BaseTextDocument *baseTextDocument) const;
-    QTextCursor cursor(const BaseTextDocument *baseTextDocument) const;
+    QTextCursor selection(const TextDocument *baseTextDocument) const;
+    QTextCursor cursor(const TextDocument *baseTextDocument) const;
     void fromPostition(int positionBlock, int positionColumn, int anchorBlock, int anchorColumn);
     bool hasSelection() { return !(positionBlock == anchorBlock && positionColumn == anchorColumn); }
 
@@ -85,7 +85,7 @@ public:
     int anchorColumn;
 
 private:
-    QTextCursor cursor(const BaseTextDocument *baseTextDocument, bool fullSelection) const;
+    QTextCursor cursor(const TextDocument *baseTextDocument, bool fullSelection) const;
 };
 
 //================BaseTextEditorPrivate==============
diff --git a/src/plugins/texteditor/codecselector.cpp b/src/plugins/texteditor/codecselector.cpp
index 14faaf7279..0e3a0f887a 100644
--- a/src/plugins/texteditor/codecselector.cpp
+++ b/src/plugins/texteditor/codecselector.cpp
@@ -62,7 +62,7 @@ public:
 } // namespace TextEditor
 
 
-CodecSelector::CodecSelector(QWidget *parent, BaseTextDocument *doc)
+CodecSelector::CodecSelector(QWidget *parent, TextDocument *doc)
     : QDialog(parent)
 {
     m_hasDecodingError = doc->hasDecodingError();
diff --git a/src/plugins/texteditor/codecselector.h b/src/plugins/texteditor/codecselector.h
index f95f5acaba..813558e94e 100644
--- a/src/plugins/texteditor/codecselector.h
+++ b/src/plugins/texteditor/codecselector.h
@@ -39,7 +39,7 @@ namespace Utils { class ListWidget; }
 
 namespace TextEditor {
 
-class BaseTextDocument;
+class TextDocument;
 
 namespace Internal {
 
@@ -49,7 +49,7 @@ class CodecSelector : public QDialog
 
 public:
 
-    CodecSelector(QWidget *parent, BaseTextDocument *doc);
+    CodecSelector(QWidget *parent, TextDocument *doc);
     ~CodecSelector();
 
     QTextCodec *selectedCodec() const;
diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp
index b4a916f29b..43a4b7ce40 100644
--- a/src/plugins/texteditor/findincurrentfile.cpp
+++ b/src/plugins/texteditor/findincurrentfile.cpp
@@ -63,7 +63,7 @@ Utils::FileIterator *FindInCurrentFile::files(const QStringList &nameFilters,
 {
     Q_UNUSED(nameFilters)
     QString fileName = additionalParameters.toString();
-    QMap<QString, QTextCodec *> openEditorEncodings = BaseTextDocument::openedTextDocumentEncodings();
+    QMap<QString, QTextCodec *> openEditorEncodings = TextDocument::openedTextDocumentEncodings();
     QTextCodec *codec = openEditorEncodings.value(fileName);
     if (!codec)
         codec = Core::EditorManager::defaultTextCodec();
diff --git a/src/plugins/texteditor/findinopenfiles.cpp b/src/plugins/texteditor/findinopenfiles.cpp
index e3e33beda3..dd1995e58c 100644
--- a/src/plugins/texteditor/findinopenfiles.cpp
+++ b/src/plugins/texteditor/findinopenfiles.cpp
@@ -65,7 +65,7 @@ Utils::FileIterator *FindInOpenFiles::files(const QStringList &nameFilters,
     Q_UNUSED(nameFilters)
     Q_UNUSED(additionalParameters)
     QMap<QString, QTextCodec *> openEditorEncodings
-            = BaseTextDocument::openedTextDocumentEncodings();
+            = TextDocument::openedTextDocumentEncodings();
     QStringList fileNames;
     QList<QTextCodec *> codecs;
     foreach (Core::DocumentModel::Entry *entry,
diff --git a/src/plugins/texteditor/plaintexteditorfactory.cpp b/src/plugins/texteditor/plaintexteditorfactory.cpp
index a9cc7e0884..78b4e0800c 100644
--- a/src/plugins/texteditor/plaintexteditorfactory.cpp
+++ b/src/plugins/texteditor/plaintexteditorfactory.cpp
@@ -61,7 +61,7 @@ PlainTextEditorFactory::PlainTextEditorFactory()
     setDisplayName(qApp->translate("OpenWith::Editors", Core::Constants::K_DEFAULT_TEXT_EDITOR_DISPLAY_NAME));
     addMimeType(QLatin1String(TextEditor::Constants::C_TEXTEDITOR_MIMETYPE_TEXT));
 
-    setDocumentCreator([]() { return new BaseTextDocument(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID); });
+    setDocumentCreator([]() { return new TextDocument(Core::Constants::K_DEFAULT_TEXT_EDITOR_ID); });
     setEditorWidgetCreator([]() { return new PlainTextEditorWidget; });
     setIndenterCreator([]() { return new NormalIndenter; });
 
diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp
index a7474e2029..e025fbd22a 100644
--- a/src/plugins/texteditor/refactoringchanges.cpp
+++ b/src/plugins/texteditor/refactoringchanges.cpp
@@ -384,7 +384,7 @@ void RefactoringFile::apply()
 
 void RefactoringFile::indentOrReindent(void (RefactoringChangesData::*mf)(const QTextCursor &,
                                                                           const QString &,
-                                                                          const BaseTextDocument *) const,
+                                                                          const TextDocument *) const,
                                        const RefactoringSelections &ranges)
 {
     typedef QPair<QTextCursor, QTextCursor> CursorPair;
@@ -406,12 +406,12 @@ void RefactoringFile::fileChanged()
 RefactoringChangesData::~RefactoringChangesData()
 {}
 
-void RefactoringChangesData::indentSelection(const QTextCursor &, const QString &, const BaseTextDocument *) const
+void RefactoringChangesData::indentSelection(const QTextCursor &, const QString &, const TextDocument *) const
 {
     qWarning() << Q_FUNC_INFO << "not implemented";
 }
 
-void RefactoringChangesData::reindentSelection(const QTextCursor &, const QString &, const BaseTextDocument *) const
+void RefactoringChangesData::reindentSelection(const QTextCursor &, const QString &, const TextDocument *) const
 {
     qWarning() << Q_FUNC_INFO << "not implemented";
 }
diff --git a/src/plugins/texteditor/refactoringchanges.h b/src/plugins/texteditor/refactoringchanges.h
index 27af9999b6..af42647d0c 100644
--- a/src/plugins/texteditor/refactoringchanges.h
+++ b/src/plugins/texteditor/refactoringchanges.h
@@ -44,7 +44,7 @@ class QTextDocument;
 QT_END_NAMESPACE
 
 namespace TextEditor {
-class BaseTextDocument;
+class TextDocument;
 class BaseTextEditorWidget;
 class RefactoringChanges;
 class RefactoringFile;
@@ -99,7 +99,7 @@ protected:
 
     void indentOrReindent(void (RefactoringChangesData::*mf)(const QTextCursor &,
                                                              const QString &,
-                                                             const BaseTextDocument *) const,
+                                                             const TextDocument *) const,
                           const RefactoringSelections &ranges);
 
 protected:
@@ -159,10 +159,10 @@ public:
 
     virtual void indentSelection(const QTextCursor &selection,
                                  const QString &fileName,
-                                 const BaseTextDocument *textEditor) const;
+                                 const TextDocument *textEditor) const;
     virtual void reindentSelection(const QTextCursor &selection,
                                    const QString &fileName,
-                                   const BaseTextDocument *textEditor) const;
+                                   const TextDocument *textEditor) const;
     virtual void fileChanged(const QString &fileName);
 };
 
diff --git a/src/plugins/texteditor/textmark.cpp b/src/plugins/texteditor/textmark.cpp
index 033b88b3fa..1c4f039b6f 100644
--- a/src/plugins/texteditor/textmark.cpp
+++ b/src/plugins/texteditor/textmark.cpp
@@ -171,12 +171,12 @@ void TextMark::dragToLine(int lineNumber)
     Q_UNUSED(lineNumber);
 }
 
-BaseTextDocument *TextMark::baseTextDocument() const
+TextDocument *TextMark::baseTextDocument() const
 {
     return m_baseTextDocument;
 }
 
-void TextMark::setBaseTextDocument(BaseTextDocument *baseTextDocument)
+void TextMark::setBaseTextDocument(TextDocument *baseTextDocument)
 {
     m_baseTextDocument = baseTextDocument;
 }
@@ -197,7 +197,7 @@ TextMarkRegistry::TextMarkRegistry(QObject *parent)
 void TextMarkRegistry::add(TextMark *mark)
 {
     m_marks[FileName::fromString(mark->fileName())].insert(mark);
-    auto document = qobject_cast<BaseTextDocument*>(DocumentModel::documentForFilePath(mark->fileName()));
+    auto document = qobject_cast<TextDocument*>(DocumentModel::documentForFilePath(mark->fileName()));
     if (!document)
         return;
     document->addMark(mark);
@@ -210,7 +210,7 @@ bool TextMarkRegistry::remove(TextMark *mark)
 
 void TextMarkRegistry::editorOpened(Core::IEditor *editor)
 {
-    auto document = qobject_cast<BaseTextDocument *>(editor ? editor->document() : 0);
+    auto document = qobject_cast<TextDocument *>(editor ? editor->document() : 0);
     if (!document)
         return;
     if (!m_marks.contains(FileName::fromString(document->filePath())))
@@ -223,7 +223,7 @@ void TextMarkRegistry::editorOpened(Core::IEditor *editor)
 void TextMarkRegistry::documentRenamed(IDocument *document, const
                                            QString &oldName, const QString &newName)
 {
-    BaseTextDocument *baseTextDocument = qobject_cast<BaseTextDocument *>(document);
+    TextDocument *baseTextDocument = qobject_cast<TextDocument *>(document);
     if (!document)
         return;
     FileName oldFileName = FileName::fromString(oldName);
diff --git a/src/plugins/texteditor/textmark.h b/src/plugins/texteditor/textmark.h
index 8532aea82b..b637c9ee0e 100644
--- a/src/plugins/texteditor/textmark.h
+++ b/src/plugins/texteditor/textmark.h
@@ -44,7 +44,7 @@ QT_END_NAMESPACE
 namespace TextEditor {
 
 class BaseTextEditor;
-class BaseTextDocument;
+class TextDocument;
 
 namespace Internal { class TextMarkRegistry; }
 
@@ -87,14 +87,14 @@ public:
     double widthFactor() const;
     void setWidthFactor(double factor);
 
-    BaseTextDocument *baseTextDocument() const;
-    void setBaseTextDocument(BaseTextDocument *baseTextDocument);
+    TextDocument *baseTextDocument() const;
+    void setBaseTextDocument(TextDocument *baseTextDocument);
 
 private:
     Q_DISABLE_COPY(TextMark)
     friend class Internal::TextMarkRegistry;
 
-    BaseTextDocument *m_baseTextDocument;
+    TextDocument *m_baseTextDocument;
     QString m_fileName;
     int m_lineNumber;
     Priority m_priority;