TextEditor: Rename BaseTextEditorWidget to TextEditorWidget

... and some of the related implementation details

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

src/libs/qmljs/qmljsicontextpane.h

@@ -37,7 +37,7 @@
 #include <qmljs/qmljsdocument.h>
 #include <qmljs/parser/qmljsastfwd_p.h>
 
-namespace TextEditor { class BaseTextEditorWidget; }
+namespace TextEditor { class TextEditorWidget; }
 
 namespace QmlJS {
 
@@ -50,9 +50,9 @@ class QMLJS_EXPORT IContextPane : public QObject
 public:
     IContextPane(QObject *parent = 0) : QObject(parent) {}
     virtual ~IContextPane() {}
-    virtual void apply(TextEditor::BaseTextEditorWidget *editorWidget, Document::Ptr document, const ScopeChain *scopeChain, AST::Node *node, bool update, bool force = false) = 0;
+    virtual void apply(TextEditor::TextEditorWidget *editorWidget, Document::Ptr document, const ScopeChain *scopeChain, AST::Node *node, bool update, bool force = false) = 0;
     virtual void setEnabled(bool) = 0;
-    virtual bool isAvailable(TextEditor::BaseTextEditorWidget *editorWidget, Document::Ptr document, AST::Node *node) = 0;
+    virtual bool isAvailable(TextEditor::TextEditorWidget *editorWidget, Document::Ptr document, AST::Node *node) = 0;
     virtual QWidget* widget() = 0;
 signals:
     void closed();

src/plugins/android/androidmanifesteditor.cpp

@@ -84,7 +84,7 @@ Core::IDocument *AndroidManifestEditor::document()
     return textEditor()->textDocument();
 }
 
-TextEditor::BaseTextEditorWidget *AndroidManifestEditor::textEditor() const
+TextEditor::TextEditorWidget *AndroidManifestEditor::textEditor() const
 {
     return widget()->textEditorWidget();
 }

src/plugins/android/androidmanifesteditor.h

@@ -54,7 +54,7 @@ public:
     QWidget *toolBar();
     AndroidManifestEditorWidget *widget() const;
     Core::IDocument *document();
-    TextEditor::BaseTextEditorWidget *textEditor() const;
+    TextEditor::TextEditorWidget *textEditor() const;
 
     int currentLine() const;
     int currentColumn() const;

src/plugins/android/androidmanifesteditorfactory.cpp

@@ -46,7 +46,7 @@ public:
         : TextEditorActionHandler(parent, Constants::ANDROID_MANIFEST_EDITOR_CONTEXT)
     {}
 private:
-    TextEditor::BaseTextEditorWidget *resolveTextEditorWidget(Core::IEditor *editor) const
+    TextEditor::TextEditorWidget *resolveTextEditorWidget(Core::IEditor *editor) const
     {
         AndroidManifestEditor *androidManifestEditor = static_cast<AndroidManifestEditor *>(editor);
         return androidManifestEditor->textEditor();

src/plugins/android/androidmanifesteditorwidget.cpp

@@ -623,7 +623,7 @@ Core::IEditor *AndroidManifestEditorWidget::editor() const
     return m_editor;
 }
 
-TextEditor::BaseTextEditorWidget *AndroidManifestEditorWidget::textEditorWidget() const
+TextEditor::TextEditorWidget *AndroidManifestEditorWidget::textEditorWidget() const
 {
     return m_textEditorWidget;
 }
@@ -1425,9 +1425,9 @@ int PermissionsModel::rowCount(const QModelIndex &parent) const
 
 
 AndroidManifestTextEditorWidget::AndroidManifestTextEditorWidget(AndroidManifestEditorWidget *parent)
-    : TextEditor::BaseTextEditorWidget(parent)
+    : TextEditor::TextEditorWidget(parent)
 {
-    setTextDocument(TextEditor::BaseTextDocumentPtr(new AndroidManifestDocument(parent)));
+    setTextDocument(TextEditor::TextDocumentPtr(new AndroidManifestDocument(parent)));
     setupAsPlainEditor();
     textDocument()->setMimeType(QLatin1String(Constants::ANDROID_MANIFEST_MIME_TYPE));
 }

src/plugins/android/androidmanifesteditorwidget.h

@@ -79,7 +79,7 @@ private:
     QStringList m_permissions;
 };
 
-class AndroidManifestTextEditorWidget : public TextEditor::BaseTextEditorWidget
+class AndroidManifestTextEditorWidget : public TextEditor::TextEditorWidget
 {
 public:
     explicit AndroidManifestTextEditorWidget(AndroidManifestEditorWidget *parent);
@@ -106,7 +106,7 @@ public:
     void preSave();
 
     Core::IEditor *editor() const;
-    TextEditor::BaseTextEditorWidget *textEditorWidget() const;
+    TextEditor::TextEditorWidget *textEditorWidget() const;
 
 public slots:
     void setDirty(bool dirty = true);
@@ -190,7 +190,7 @@ private:
     QComboBox *m_permissionsComboBox;
 
     QTimer m_timerParseCheck;
-    TextEditor::BaseTextEditorWidget *m_textEditorWidget;
+    TextEditor::TextEditorWidget *m_textEditorWidget;
     QStackedWidget *m_stackedWidget;
     AndroidManifestEditor *m_editor;
 };

src/plugins/android/javaeditor.cpp

@@ -52,7 +52,7 @@ namespace Internal {
 // JavaEditorWidget
 //
 
-class JavaEditorWidget : public TextEditor::BaseTextEditorWidget
+class JavaEditorWidget : public TextEditor::TextEditorWidget
 {
 public:
     JavaEditorWidget()

src/plugins/android/javaeditor.h

@@ -35,7 +35,7 @@
 namespace Android {
 namespace Internal {
 
-class JavaEditorFactory : public TextEditor::BaseTextEditorFactory
+class JavaEditorFactory : public TextEditor::TextEditorFactory
 {
     Q_OBJECT
 

src/plugins/clangcodemodel/clangcompletion.cpp

@@ -263,7 +263,7 @@ public:
     {}
 
     virtual bool isCorrective() const { return m_replaceDotForArrow; }
-    virtual void makeCorrection(BaseTextEditorWidget *editorWidget)
+    virtual void makeCorrection(TextEditorWidget *editorWidget)
     {
         editorWidget->setCursorPosition(basePosition() - 1);
         editorWidget->replace(1, QLatin1String("->"));
@@ -351,7 +351,7 @@ public:
     ClangAssistProposalItem() {}
 
     virtual bool prematurelyApplies(const QChar &c) const;
-    virtual void applyContextualContent(TextEditor::BaseTextEditorWidget *editorWidget,
+    virtual void applyContextualContent(TextEditor::TextEditorWidget *editorWidget,
                                         int basePosition) const;
 
     void keepCompletionOperator(unsigned compOp) { m_completionOperator = compOp; }
@@ -410,7 +410,7 @@ bool ClangAssistProposalItem::prematurelyApplies(const QChar &typedChar) const
     return ok;
 }
 
-void ClangAssistProposalItem::applyContextualContent(BaseTextEditorWidget *editorWidget,
+void ClangAssistProposalItem::applyContextualContent(TextEditorWidget *editorWidget,
                                                      int basePosition) const
 {
     const CodeCompletionResult ccr = originalItem();

src/plugins/cmakeprojectmanager/cmakeeditor.cpp

@@ -140,7 +140,7 @@ QString CMakeEditor::contextHelpId() const
 // CMakeEditorWidget
 //
 
-class CMakeEditorWidget : public BaseTextEditorWidget
+class CMakeEditorWidget : public TextEditorWidget
 {
 public:
     CMakeEditorWidget();

src/plugins/cmakeprojectmanager/cmakeeditor.h

@@ -51,7 +51,7 @@ public:
     friend class CMakeEditorWidget;
 };
 
-class CMakeEditorFactory : public TextEditor::BaseTextEditorFactory
+class CMakeEditorFactory : public TextEditor::TextEditorFactory
 {
     Q_OBJECT
 

src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

@@ -236,7 +236,7 @@ namespace CppEditor {
 namespace Internal {
 
 CppDocumentationCommentHelper::CppDocumentationCommentHelper(
-        TextEditor::BaseTextEditorWidget *editorWidget)
+        TextEditor::TextEditorWidget *editorWidget)
     : m_editorWidget(editorWidget)
     , m_settings(CppToolsSettings::instance()->commentsSettings())
 {

src/plugins/cppeditor/cppdocumentationcommenthelper.h

@@ -36,7 +36,7 @@
 
 QT_FORWARD_DECLARE_CLASS(QKeyEvent)
 
-namespace TextEditor { class BaseTextEditorWidget; }
+namespace TextEditor { class TextEditorWidget; }
 
 namespace CppEditor {
 namespace Internal {
@@ -47,7 +47,7 @@ class CppDocumentationCommentHelper : public QObject
     Q_DISABLE_COPY(CppDocumentationCommentHelper)
 
 public:
-    explicit CppDocumentationCommentHelper(TextEditor::BaseTextEditorWidget *editorWidget);
+    explicit CppDocumentationCommentHelper(TextEditor::TextEditorWidget *editorWidget);
     bool handleKeyPressEvent(QKeyEvent *e) const;
 
 private slots:
@@ -56,7 +56,7 @@ private slots:
 private:
     CppDocumentationCommentHelper();
 
-    TextEditor::BaseTextEditorWidget *m_editorWidget;
+    TextEditor::TextEditorWidget *m_editorWidget;
     CppTools::CommentsSettings m_settings;
 };
 

src/plugins/cppeditor/cppeditor.cpp

@@ -219,11 +219,11 @@ void CppEditorWidget::finalizeInitialization()
     connect(cmd, SIGNAL(keySequenceChanged()), this, SLOT(updatePreprocessorButtonTooltip()));
     updatePreprocessorButtonTooltip();
     connect(d->m_preprocessorButton, SIGNAL(clicked()), this, SLOT(showPreProcessorWidget()));
-    insertExtraToolBarWidget(BaseTextEditorWidget::Left, d->m_preprocessorButton);
-    insertExtraToolBarWidget(BaseTextEditorWidget::Left, d->m_cppEditorOutline->widget());
+    insertExtraToolBarWidget(TextEditorWidget::Left, d->m_preprocessorButton);
+    insertExtraToolBarWidget(TextEditorWidget::Left, d->m_cppEditorOutline->widget());
 }
 
-void CppEditorWidget::finalizeInitializationAfterDuplication(BaseTextEditorWidget *other)
+void CppEditorWidget::finalizeInitializationAfterDuplication(TextEditorWidget *other)
 {
     QTC_ASSERT(other, return);
     CppEditorWidget *cppEditorWidget = qobject_cast<CppEditorWidget *>(other);
@@ -256,7 +256,7 @@ void CppEditorWidget::paste()
     if (d->m_localRenaming.handlePaste())
         return;
 
-    BaseTextEditorWidget::paste();
+    TextEditorWidget::paste();
 }
 
 void CppEditorWidget::cut()
@@ -264,7 +264,7 @@ void CppEditorWidget::cut()
     if (d->m_localRenaming.handleCut())
         return;
 
-    BaseTextEditorWidget::cut();
+    TextEditorWidget::cut();
 }
 
 void CppEditorWidget::selectAll()
@@ -272,7 +272,7 @@ void CppEditorWidget::selectAll()
     if (d->m_localRenaming.handleSelectAll())
         return;
 
-    BaseTextEditorWidget::selectAll();
+    TextEditorWidget::selectAll();
 }
 
 void CppEditorWidget::onCppDocumentUpdated()
@@ -285,7 +285,7 @@ void CppEditorWidget::onCodeWarningsUpdated(unsigned revision,
 {
     if (revision != documentRevision())
         return;
-    setExtraSelections(BaseTextEditorWidget::CodeWarningsSelection, selections);
+    setExtraSelections(TextEditorWidget::CodeWarningsSelection, selections);
 }
 
 void CppEditorWidget::onIfdefedOutBlocksUpdated(unsigned revision,
@@ -469,7 +469,7 @@ bool CppEditorWidget::event(QEvent *e)
         break;
     }
 
-    return BaseTextEditorWidget::event(e);
+    return TextEditorWidget::event(e);
 }
 
 void CppEditorWidget::performQuickFix(int index)
@@ -479,7 +479,7 @@ void CppEditorWidget::performQuickFix(int index)
 
 void CppEditorWidget::processKeyNormally(QKeyEvent *e)
 {
-    BaseTextEditorWidget::keyPressEvent(e);
+    TextEditorWidget::keyPressEvent(e);
 }
 
 void CppEditorWidget::contextMenuEvent(QContextMenuEvent *e)
@@ -541,13 +541,13 @@ void CppEditorWidget::keyPressEvent(QKeyEvent *e)
     if (d->m_cppDocumentationCommentHelper.handleKeyPressEvent(e))
         return;
 
-    BaseTextEditorWidget::keyPressEvent(e);
+    TextEditorWidget::keyPressEvent(e);
 }
 
 void CppEditorWidget::applyFontSettings()
 {
     // This also makes the document apply font settings
-    BaseTextEditorWidget::applyFontSettings();
+    TextEditorWidget::applyFontSettings();
 }
 
 void CppEditorWidget::slotCodeStyleSettingsChanged(const QVariant &)
@@ -610,7 +610,7 @@ AssistInterface *CppEditorWidget::createAssistInterface(AssistKind kind, AssistR
         if (isSemanticInfoValid())
             return new CppQuickFixAssistInterface(const_cast<CppEditorWidget *>(this), reason);
     } else {
-        return BaseTextEditorWidget::createAssistInterface(kind, reason);
+        return TextEditorWidget::createAssistInterface(kind, reason);
     }
     return 0;
 }

src/plugins/cppeditor/cppeditor.h

@@ -57,7 +57,7 @@ public:
     CppEditor();
 };
 
-class CppEditorWidget : public TextEditor::BaseTextEditorWidget
+class CppEditorWidget : public TextEditor::TextEditorWidget
 {
     Q_OBJECT
 
@@ -135,7 +135,7 @@ private slots:
 
 private:
     void finalizeInitialization() Q_DECL_OVERRIDE;
-    void finalizeInitializationAfterDuplication(BaseTextEditorWidget *other) Q_DECL_OVERRIDE;
+    void finalizeInitializationAfterDuplication(TextEditorWidget *other) Q_DECL_OVERRIDE;
 
     unsigned documentRevision() const;
 

src/plugins/cppeditor/cppeditoroutline.cpp

@@ -252,7 +252,7 @@ void CppEditorOutline::gotoSymbolInEditor()
     if (!symbol)
         return;
 
-    const TextEditor::BaseTextEditorWidget::Link &link = CppEditorWidget::linkToSymbol(symbol);
+    const TextEditor::TextEditorWidget::Link &link = CppEditorWidget::linkToSymbol(symbol);
     if (!link.hasValidTarget())
         return;
 

src/plugins/cppeditor/cppeditorplugin.cpp

@@ -75,7 +75,7 @@ enum { QUICKFIX_INTERVAL = 20 };
 
 //////////////////////////// CppEditorFactory /////////////////////////////
 
-class CppEditorFactory : public BaseTextEditorFactory
+class CppEditorFactory : public TextEditorFactory
 {
 public:
     CppEditorFactory()

src/plugins/cppeditor/cppelementevaluator.cpp

@@ -61,7 +61,7 @@ static QStringList stripName(const QString &name)
     return all;
 }
 
-CppElementEvaluator::CppElementEvaluator(TextEditor::BaseTextEditorWidget *editor) :
+CppElementEvaluator::CppElementEvaluator(TextEditor::TextEditorWidget *editor) :
     m_editor(editor),
     m_modelManager(CppTools::CppModelManager::instance()),
     m_tc(editor->textCursor()),
@@ -122,7 +122,7 @@ void CppElementEvaluator::execute()
 void CppElementEvaluator::checkDiagnosticMessage(int pos)
 {
     foreach (const QTextEdit::ExtraSelection &sel,
-             m_editor->extraSelections(TextEditor::BaseTextEditorWidget::CodeWarningsSelection)) {
+             m_editor->extraSelections(TextEditor::TextEditorWidget::CodeWarningsSelection)) {
         if (pos >= sel.cursor.selectionStart() && pos <= sel.cursor.selectionEnd()) {
             m_diagnosis = sel.format.toolTip();
             break;
@@ -264,7 +264,7 @@ CppInclude::CppInclude(const Document::Include &includeFile) :
     helpCategory = TextEditor::HelpItem::Brief;
     helpIdCandidates = QStringList(fileName);
     helpMark = fileName;
-    link = TextEditor::BaseTextEditorWidget::Link(path);
+    link = TextEditor::TextEditorWidget::Link(path);
     tooltip = path;
 }
 
@@ -275,7 +275,7 @@ CppMacro::CppMacro(const Macro &macro)
     const QString macroName = QString::fromUtf8(macro.name(), macro.name().size());
     helpIdCandidates = QStringList(macroName);
     helpMark = macroName;
-    link = TextEditor::BaseTextEditorWidget::Link(macro.fileName(), macro.line());
+    link = TextEditor::TextEditorWidget::Link(macro.fileName(), macro.line());
     tooltip = macro.toStringWithLineBreaks();
 }
 

src/plugins/cppeditor/cppelementevaluator.h

@@ -56,7 +56,7 @@ class CppElement;
 class CppElementEvaluator
 {
 public:
-    explicit CppElementEvaluator(TextEditor::BaseTextEditorWidget *editor);
+    explicit CppElementEvaluator(TextEditor::TextEditorWidget *editor);
 
     void setTextCursor(const QTextCursor &tc);
     void setLookupBaseClasses(const bool lookup);
@@ -78,7 +78,7 @@ private:
                                const CPlusPlus::LookupContext &lookupContext,
                                const CPlusPlus::Scope *scope);
 
-    TextEditor::BaseTextEditorWidget *m_editor;
+    TextEditor::TextEditorWidget *m_editor;
     CppTools::CppModelManager *m_modelManager;
     QTextCursor m_tc;
     bool m_lookupBaseClasses;
@@ -99,7 +99,7 @@ public:
     TextEditor::HelpItem::Category helpCategory;
     QStringList helpIdCandidates;
     QString helpMark;
-    TextEditor::BaseTextEditorWidget::Link link;
+    TextEditor::TextEditorWidget::Link link;
     QString tooltip;
 };
 

src/plugins/cppeditor/cppfollowsymbolundercursor.cpp

@@ -54,7 +54,7 @@ using namespace CppEditor;
 using namespace CppEditor::Internal;
 using namespace TextEditor;
 
-typedef BaseTextEditorWidget::Link Link;
+typedef TextEditorWidget::Link Link;
 
 namespace {
 
@@ -424,7 +424,7 @@ static int skipMatchingParentheses(const QList<Token> &tokens, int idx, int init
     return j;
 }
 
-BaseTextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor &cursor,
+TextEditorWidget::Link FollowSymbolUnderCursor::findLink(const QTextCursor &cursor,
     bool resolveTarget, const Snapshot &theSnapshot, const Document::Ptr &documentFromSemanticInfo,
     SymbolFinder *symbolFinder, bool inNextSplit)
 {

src/plugins/cppeditor/cppfollowsymbolundercursor.h

@@ -49,7 +49,7 @@ class VirtualFunctionAssistProvider;
 class FollowSymbolUnderCursor
 {
 public:
-    typedef TextEditor::BaseTextEditorWidget::Link Link;
+    typedef TextEditor::TextEditorWidget::Link Link;
 
     FollowSymbolUnderCursor(CppEditorWidget *widget);
     ~FollowSymbolUnderCursor();

src/plugins/cppeditor/cpphoverhandler.cpp

@@ -57,7 +57,7 @@ bool CppHoverHandler::acceptEditor(IEditor *editor)
     return editor->document()->id() == CppEditor::Constants::CPPEDITOR_ID;
 }
 
-void CppHoverHandler::identifyMatch(BaseTextEditorWidget *editorWidget, int pos)
+void CppHoverHandler::identifyMatch(TextEditorWidget *editorWidget, int pos)
 {
     if (!editorWidget->extraSelectionTooltip(pos).isEmpty()) {
         setToolTip(editorWidget->extraSelectionTooltip(pos));

src/plugins/cppeditor/cpphoverhandler.h

@@ -43,7 +43,7 @@ public:
 
 private:
     virtual bool acceptEditor(Core::IEditor *editor);
-    virtual void identifyMatch(TextEditor::BaseTextEditorWidget *editorWidget, int pos);
+    virtual void identifyMatch(TextEditor::TextEditorWidget *editorWidget, int pos);
     virtual void decorateToolTip();
 };
 

src/plugins/cppeditor/cppincludehierarchy.cpp

@@ -50,8 +50,7 @@
 #include <QStandardItem>
 #include <QVBoxLayout>
 
-using namespace CppEditor;
-using namespace CppEditor::Internal;
+using namespace TextEditor;
 using namespace Utils;
 
 namespace CppEditor {
@@ -163,8 +162,7 @@ void CppIncludeHierarchyWidget::perform()
 
 void CppIncludeHierarchyWidget::onItemActivated(const QModelIndex &index)
 {
-    const TextEditor::BaseTextEditorWidget::Link link
-            = index.data(LinkRole).value<TextEditor::BaseTextEditorWidget::Link>();
+    const TextEditorWidget::Link link = index.data(LinkRole).value<TextEditorWidget::Link>();
     if (link.hasValidTarget())
         Core::EditorManager::openEditorAt(link.targetFileName,
                                           link.targetLine,

src/plugins/cppeditor/cppincludehierarchymodel.cpp

@@ -149,7 +149,7 @@ QVariant CppIncludeHierarchyModel::data(const QModelIndex &index, int role) cons
         return Core::FileIconProvider::icon(QFileInfo(item->filePath()));
     case LinkRole: {
         QVariant itemLink;
-        TextEditor::BaseTextEditorWidget::Link link(item->filePath(), item->line());
+        TextEditor::TextEditorWidget::Link link(item->filePath(), item->line());
         itemLink.setValue(link);
         return itemLink;
     }

src/plugins/cppeditor/cpplocalrenaming.cpp

@@ -61,7 +61,7 @@ void modifyCursorSelection(QTextCursor &cursor, int position, int anchor)
 namespace CppEditor {
 namespace Internal {
 
-CppLocalRenaming::CppLocalRenaming(TextEditor::BaseTextEditorWidget *editorWidget)
+CppLocalRenaming::CppLocalRenaming(TextEditor::TextEditorWidget *editorWidget)
     : m_editorWidget(editorWidget)
     , m_modifyingSelections(false)
     , m_renameSelectionChanged(false)
@@ -97,7 +97,7 @@ bool CppLocalRenaming::handlePaste()
         return false;
 
     startRenameChange();
-    m_editorWidget->BaseTextEditorWidget::paste();
+    m_editorWidget->TextEditorWidget::paste();
     finishRenameChange();
     return true;
 }
@@ -108,7 +108,7 @@ bool CppLocalRenaming::handleCut()
         return false;
 
     startRenameChange();
-    m_editorWidget->BaseTextEditorWidget::paste();
+    m_editorWidget->TextEditorWidget::paste();
     finishRenameChange();
     return true;
 }
@@ -289,7 +289,7 @@ void CppLocalRenaming::startRenameChange()
 
 void CppLocalRenaming::updateEditorWidgetWithSelections()
 {
-    m_editorWidget->setExtraSelections(TextEditor::BaseTextEditorWidget::CodeSemanticsSelection,
+    m_editorWidget->setExtraSelections(TextEditor::TextEditorWidget::CodeSemanticsSelection,
                                        m_selections);
 }
 

src/plugins/cppeditor/cpplocalrenaming.h

@@ -34,7 +34,7 @@
 
 #include <QTextEdit>
 
-namespace TextEditor { class BaseTextEditorWidget; }
+namespace TextEditor { class TextEditorWidget; }
 
 namespace CppEditor {
 namespace Internal {
@@ -45,7 +45,7 @@ class CppLocalRenaming : public QObject
     Q_DISABLE_COPY(CppLocalRenaming)
 
 public:
-    explicit CppLocalRenaming(TextEditor::BaseTextEditorWidget *editorWidget);
+    explicit CppLocalRenaming(TextEditor::TextEditorWidget *editorWidget);
 
     bool start();
     bool isActive() const;
@@ -95,7 +95,7 @@ private:
     QTextCharFormat textCharFormat(TextEditor::TextStyle category) const;
 
 private:
-    TextEditor::BaseTextEditorWidget *m_editorWidget;
+    TextEditor::TextEditorWidget *m_editorWidget;
 
     QList<QTextEdit::ExtraSelection> m_selections;
     int m_renameSelectionIndex;

src/plugins/cppeditor/cpptypehierarchy.cpp

@@ -232,8 +232,7 @@ void CppTypeHierarchyWidget::clearTypeHierarchy()
 
 void CppTypeHierarchyWidget::onItemClicked(const QModelIndex &index)
 {
-    const TextEditor::BaseTextEditorWidget::Link link
-            = index.data(LinkRole).value<TextEditor::BaseTextEditorWidget::Link>();
+    auto link = index.data(LinkRole).value<TextEditor::TextEditorWidget::Link>();
     if (link.hasValidTarget())
         Core::EditorManager::openEditorAt(link.targetFileName,
                                           link.targetLine,

src/plugins/cppeditor/cppuseselections_test.cpp

@@ -123,7 +123,7 @@ SelectionList UseSelectionsTestCase::toSelectionList(
 QList<QTextEdit::ExtraSelection> UseSelectionsTestCase::getExtraSelections() const
 {
     return m_editorWidget->extraSelections(
-        TextEditor::BaseTextEditorWidget::CodeSemanticsSelection);