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>

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

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));
 }
 

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)

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()) {

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;

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();

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;

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;
 

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.

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));

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()

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())

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);
 }

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

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);
     }

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;

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()))
 {

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);

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));
         }
     }

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();