TextEditor: More BaseText* -> Text* renamings

*Document* and *Layout* classes, all basetext* files

Change-Id: I1c6e376733a434fcb5c7f19c6210dfa031eeafde
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

src/plugins/analyzerbase/analyzerutils.cpp

@@ -32,7 +32,7 @@
 #include "analyzerconstants.h"
 
 #include <cpptools/cppmodelmanager.h>
-#include <texteditor/basetexteditor.h>
+#include <texteditor/texteditor.h>
 
 #include <utils/qtcassert.h>
 

src/plugins/android/androidmanifestdocument.h

@@ -30,7 +30,7 @@
 #ifndef ANDROIDMANIFESTDOCUMENT_H
 #define ANDROIDMANIFESTDOCUMENT_H
 
-#include <texteditor/basetexteditor.h>
+#include <texteditor/texteditor.h>
 
 namespace Android {
 namespace Internal {

src/plugins/android/androidmanifesteditor.h

@@ -34,7 +34,7 @@
 #include "androidmanifesteditorwidget.h"
 
 #include <coreplugin/editormanager/ieditor.h>
-#include <texteditor/basetexteditor.h>
+#include <texteditor/texteditor.h>
 
 QT_BEGIN_NAMESPACE
 class QToolBar;

src/plugins/android/androidmanifesteditorwidget.cpp

@@ -47,7 +47,7 @@
 #include <projectexplorer/kitinformation.h>
 
 #include <texteditor/texteditoractionhandler.h>
-#include <texteditor/basetexteditor.h>
+#include <texteditor/texteditor.h>
 #include <utils/algorithm.h>
 
 #include <QLineEdit>

src/plugins/android/androidmanifesteditorwidget.h

@@ -30,7 +30,7 @@
 #ifndef ANDROIDMANIFESTEDITORWIDGET_H
 #define ANDROIDMANIFESTEDITORWIDGET_H
 
-#include <texteditor/basetexteditor.h>
+#include <texteditor/texteditor.h>
 
 #include <QAbstractListModel>
 #include <QStackedWidget>

src/plugins/android/javaeditor.cpp

@@ -33,8 +33,8 @@
 #include "androidconstants.h"
 #include "javacompletionassistprovider.h"
 
-#include <texteditor/basetextdocument.h>
-#include <texteditor/basetexteditor.h>
+#include <texteditor/textdocument.h>
+#include <texteditor/texteditor.h>
 #include <utils/uncommentselection.h>
 #include <coreplugin/editormanager/ieditorfactory.h>
 

src/plugins/android/javaeditor.h

@@ -30,7 +30,7 @@
 #ifndef JAVAEDITOR_H
 #define JAVAEDITOR_H
 
-#include <texteditor/basetexteditor.h>
+#include <texteditor/texteditor.h>
 
 namespace Android {
 namespace Internal {

src/plugins/beautifier/beautifierplugin.cpp

@@ -45,9 +45,9 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/messagemanager.h>
 #include <diffeditor/differ.h>
-#include <texteditor/basetextdocument.h>
-#include <texteditor/basetextdocumentlayout.h>
-#include <texteditor/basetexteditor.h>
+#include <texteditor/textdocument.h>
+#include <texteditor/textdocumentlayout.h>
+#include <texteditor/texteditor.h>
 #include <texteditor/texteditorconstants.h>
 #include <utils/fileutils.h>
 #include <utils/QtConcurrentTools>
@@ -288,7 +288,7 @@ void BeautifierPlugin::formatCurrentFileContinue(QObject *watcher)
         if (const TextBlockUserData *userdata = static_cast<TextBlockUserData *>(block.userData())) {
             if (userdata->folded()) {
                 foldedBlocks << block.blockNumber();
-                BaseTextDocumentLayout::doFoldOrUnfold(block, true);
+                TextDocumentLayout::doFoldOrUnfold(block, true);
             }
         }
         block = block.next();
@@ -386,7 +386,7 @@ void BeautifierPlugin::formatCurrentFileContinue(QObject *watcher)
     for (int i = 0; i < total; ++i) {
         QTextBlock block = doc->findBlockByNumber(qMax(0, foldedBlocks.at(i)));
         if (block.isValid())
-            BaseTextDocumentLayout::doFoldOrUnfold(block, false);
+            TextDocumentLayout::doFoldOrUnfold(block, false);
     }
 
     textEditor->document()->setModified(true);

src/plugins/beautifier/clangformat/clangformat.cpp

@@ -47,7 +47,7 @@
 #include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
 #include <cppeditor/cppeditorconstants.h>
-#include <texteditor/basetexteditor.h>
+#include <texteditor/texteditor.h>
 
 #include <QAction>
 #include <QMenu>

src/plugins/bookmarks/bookmarkmanager.cpp

@@ -39,7 +39,7 @@
 #include <coreplugin/actionmanager/command.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
-#include <texteditor/basetexteditor.h>
+#include <texteditor/texteditor.h>
 #include <utils/tooltip/tooltip.h>
 #include <utils/tooltip/tipcontents.h>
 #include <utils/qtcassert.h>

src/plugins/bookmarks/bookmarkmanager.h

@@ -34,7 +34,7 @@
 #include <coreplugin/icontext.h>
 #include <coreplugin/inavigationwidgetfactory.h>
 
-#include <texteditor/basetexteditor.h>
+#include <texteditor/texteditor.h>
 
 #include <QAbstractItemModel>
 #include <QMultiMap>

src/plugins/bookmarks/bookmarksplugin.cpp

@@ -40,7 +40,7 @@
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/id.h>
 #include <extensionsystem/pluginmanager.h>
-#include <texteditor/basetexteditor.h>
+#include <texteditor/texteditor.h>
 #include <texteditor/texteditorconstants.h>
 
 #include <QtPlugin>

src/plugins/clangcodemodel/clangcompletion.cpp

@@ -46,7 +46,7 @@
 #include <cpptools/cppmodelmanager.h>
 #include <cpptools/cppworkingcopy.h>
 
-#include <texteditor/basetexteditor.h>
+#include <texteditor/texteditor.h>
 #include <texteditor/convenience.h>
 #include <texteditor/codeassist/genericproposalmodel.h>
 #include <texteditor/codeassist/assistproposalitem.h>

src/plugins/clangcodemodel/test/completiontesthelper.cpp

@@ -36,8 +36,8 @@
 
 #include <cpptools/cppcompletionassist.h>
 
-#include <texteditor/basetextdocument.h>
-#include <texteditor/basetexteditor.h>
+#include <texteditor/textdocument.h>
+#include <texteditor/texteditor.h>
 #include <texteditor/codeassist/iassistproposal.h>
 #include <texteditor/codeassist/genericproposalmodel.h>
 

src/plugins/clangcodemodel/test/completiontesthelper.h

@@ -36,7 +36,7 @@
 
 #include <QObject>
 #include <QTextDocument>
-#include <texteditor/basetexteditor.h>
+#include <texteditor/texteditor.h>
 #include <cplusplus/CppDocument.h>
 
 namespace TextEditor { class IAssistProposal; }

src/plugins/classview/classviewmanager.cpp

@@ -41,7 +41,7 @@
 #include <coreplugin/progressmanager/progressmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>
-#include <texteditor/basetexteditor.h>
+#include <texteditor/texteditor.h>
 
 #include <QThread>
 #include <QMutex>

src/plugins/cmakeprojectmanager/cmakeeditor.cpp

@@ -71,7 +71,7 @@ CMakeEditor::CMakeEditor()
 void CMakeEditor::finalizeInitialization()
 {
     connect(document(), &IDocument::changed, [this]() {
-        TextDocument *document = textDocument();
+        BaseTextDocument *document = textDocument();
         if (!document->isModified())
             return;
         InfoBar *infoBar = document->infoBar();

src/plugins/cmakeprojectmanager/cmakeeditor.h

@@ -30,8 +30,8 @@
 #ifndef CMAKEEDITOR_H
 #define CMAKEEDITOR_H
 
-#include <texteditor/basetextdocument.h>
-#include <texteditor/basetexteditor.h>
+#include <texteditor/textdocument.h>
+#include <texteditor/texteditor.h>
 
 namespace CMakeProjectManager {
 namespace Internal {

src/plugins/coreplugin/textdocument.cpp

@@ -48,10 +48,10 @@ enum { debug = 0 };
 namespace Core {
 
 namespace Internal {
-class BaseTextDocumentPrivate
+class TextDocumentPrivate
 {
 public:
-    BaseTextDocumentPrivate() : m_readResult(Utils::TextFileFormat::ReadSuccess) {}
+    TextDocumentPrivate() : m_readResult(Utils::TextFileFormat::ReadSuccess) {}
 
     Utils::TextFileFormat m_format;
     Utils::TextFileFormat::ReadResult m_readResult;
@@ -61,7 +61,7 @@ public:
 } // namespace Internal
 
 BaseTextDocument::BaseTextDocument(QObject *parent) :
-    IDocument(parent), d(new Internal::BaseTextDocumentPrivate)
+    IDocument(parent), d(new Internal::TextDocumentPrivate)
 {
     setCodec(Core::EditorManager::defaultTextCodec());
 }

src/plugins/coreplugin/textdocument.h

@@ -36,7 +36,7 @@
 
 namespace Core {
 
-namespace Internal { class BaseTextDocumentPrivate; }
+namespace Internal { class TextDocumentPrivate; }
 
 class CORE_EXPORT BaseTextDocument : public IDocument
 {
@@ -64,7 +64,7 @@ public:
     bool write(const QString &fileName, const Utils::TextFileFormat &format, const QString &data, QString *errorMessage) const;
 
 private:
-    Internal::BaseTextDocumentPrivate *d;
+    Internal::TextDocumentPrivate *d;
 };
 
 } // namespace Core