TextEditor: Rename BaseTextEditorWidget to TextEditorWidget

... and some of the related implementation details

Change-Id: I1f03aa5acf2d3fb2cfc2a6a7845f3d3578b0408d
Reviewed-by: David Schulz <david.schulz@digia.com>

5 files changed, 12 insertions, 12 deletions

diff --git a/src/plugins/cpptools/cppcodestylesettingspage.cpp b/src/plugins/cpptools/cppcodestylesettingspage.cpp
index 084e8c2d649..d9ab82ac6dd 100644
--- a/src/plugins/cpptools/cppcodestylesettingspage.cpp
+++ b/src/plugins/cpptools/cppcodestylesettingspage.cpp
@@ -220,7 +220,7 @@ namespace CppTools {
 
 namespace Internal {
 
-static void applyRefactorings(QTextDocument *textDocument, TextEditor::BaseTextEditorWidget *editor,
+static void applyRefactorings(QTextDocument *textDocument, TextEditor::TextEditorWidget *editor,
                               const CppCodeStyleSettings &settings)
 {
     // Preprocess source
diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp
index 64922367aa1..199f251ea00 100644
--- a/src/plugins/cpptools/cppcompletion_test.cpp
+++ b/src/plugins/cpptools/cppcompletion_test.cpp
@@ -79,7 +79,7 @@ public:
         m_editor = EditorManager::openEditor(fileName);
         QVERIFY(m_editor);
         closeEditorAtEndOfTestCase(m_editor);
-        m_editorWidget = qobject_cast<TextEditor::BaseTextEditorWidget *>(m_editor->widget());
+        m_editorWidget = qobject_cast<TextEditor::TextEditorWidget *>(m_editor->widget());
         QVERIFY(m_editorWidget);
 
         m_textDocument = m_editorWidget->document();
@@ -149,7 +149,7 @@ private:
     QByteArray m_source;
     int m_position;
     Snapshot m_snapshot;
-    BaseTextEditorWidget *m_editorWidget;
+    TextEditorWidget *m_editorWidget;
     QTextDocument *m_textDocument;
     IEditor *m_editor;
 };
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp
index 59cac54c102..64409e8be60 100644
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -90,7 +90,7 @@ public:
         m_isOverloaded(false) {}
 
     bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE;
-    void applyContextualContent(BaseTextEditorWidget *editorWidget, int basePosition) const Q_DECL_OVERRIDE;
+    void applyContextualContent(TextEditorWidget *editorWidget, int basePosition) const Q_DECL_OVERRIDE;
 
     bool isOverloaded() const { return m_isOverloaded; }
     void markAsOverloaded() { m_isOverloaded = true; }
@@ -161,7 +161,7 @@ bool CppAssistProposalItem::prematurelyApplies(const QChar &typedChar) const
     return false;
 }
 
-static bool isDereferenced(BaseTextEditorWidget *editorWidget, int basePosition)
+static bool isDereferenced(TextEditorWidget *editorWidget, int basePosition)
 {
     QTextCursor cursor = editorWidget->textCursor();
     cursor.setPosition(basePosition);
@@ -181,7 +181,7 @@ static bool isDereferenced(BaseTextEditorWidget *editorWidget, int basePosition)
     return false;
 }
 
-void CppAssistProposalItem::applyContextualContent(BaseTextEditorWidget *editorWidget, int basePosition) const
+void CppAssistProposalItem::applyContextualContent(TextEditorWidget *editorWidget, int basePosition) const
 {
     Symbol *symbol = 0;
 
@@ -439,13 +439,13 @@ public:
     {}
 
     bool isCorrective() const Q_DECL_OVERRIDE { return m_replaceDotForArrow; }
-    void makeCorrection(BaseTextEditorWidget *editorWidget) Q_DECL_OVERRIDE;
+    void makeCorrection(TextEditorWidget *editorWidget) Q_DECL_OVERRIDE;
 
 private:
     bool m_replaceDotForArrow;
 };
 
-void CppAssistProposal::makeCorrection(BaseTextEditorWidget *editorWidget)
+void CppAssistProposal::makeCorrection(TextEditorWidget *editorWidget)
 {
     const int oldPosition = editorWidget->position();
     editorWidget->setCursorPosition(basePosition() - 1);
diff --git a/src/plugins/cpptools/cpprefactoringchanges.cpp b/src/plugins/cpptools/cpprefactoringchanges.cpp
index ac6d740b792..2867cda3b0d 100644
--- a/src/plugins/cpptools/cpprefactoringchanges.cpp
+++ b/src/plugins/cpptools/cpprefactoringchanges.cpp
@@ -93,7 +93,7 @@ CppRefactoringChangesData *CppRefactoringChanges::data() const
     return static_cast<CppRefactoringChangesData *>(m_data.data());
 }
 
-CppRefactoringFilePtr CppRefactoringChanges::file(TextEditor::BaseTextEditorWidget *editor, const Document::Ptr &document)
+CppRefactoringFilePtr CppRefactoringChanges::file(TextEditor::TextEditorWidget *editor, const Document::Ptr &document)
 {
     CppRefactoringFilePtr result(new CppRefactoringFile(editor));
     result->setCppDocument(document);
@@ -133,7 +133,7 @@ CppRefactoringFile::CppRefactoringFile(QTextDocument *document, const QString &f
     : RefactoringFile(document, fileName)
 { }
 
-CppRefactoringFile::CppRefactoringFile(TextEditor::BaseTextEditorWidget *editor)
+CppRefactoringFile::CppRefactoringFile(TextEditor::TextEditorWidget *editor)
     : RefactoringFile(editor)
 { }
 
diff --git a/src/plugins/cpptools/cpprefactoringchanges.h b/src/plugins/cpptools/cpprefactoringchanges.h
index 286988929c1..72007a3108b 100644
--- a/src/plugins/cpptools/cpprefactoringchanges.h
+++ b/src/plugins/cpptools/cpprefactoringchanges.h
@@ -75,7 +75,7 @@ public:
 protected:
     CppRefactoringFile(const QString &fileName, const QSharedPointer<TextEditor::RefactoringChangesData> &data);
     CppRefactoringFile(QTextDocument *document, const QString &fileName);
-    CppRefactoringFile(TextEditor::BaseTextEditorWidget *editor);
+    CppRefactoringFile(TextEditor::TextEditorWidget *editor);
 
     CppRefactoringChangesData *data() const;
     virtual void fileChanged();
@@ -90,7 +90,7 @@ class CPPTOOLS_EXPORT CppRefactoringChanges: public TextEditor::RefactoringChang
 public:
     CppRefactoringChanges(const CPlusPlus::Snapshot &snapshot);
 
-    static CppRefactoringFilePtr file(TextEditor::BaseTextEditorWidget *editor,
+    static CppRefactoringFilePtr file(TextEditor::TextEditorWidget *editor,
                                       const CPlusPlus::Document::Ptr &document);
     CppRefactoringFilePtr file(const QString &fileName) const;
     // safe to use from non-gui threads