1 files changed, 27 insertions, 20 deletions

diff --git a/src/plugins/texteditor/texteditor.h b/src/plugins/texteditor/texteditor.h
index f7b69b4822..6a7aa5ec93 100644
--- a/src/plugins/texteditor/texteditor.h
+++ b/src/plugins/texteditor/texteditor.h
@@ -122,7 +122,7 @@ public:
     QChar characterAt(int pos) const;
     QString textAt(int from, int to) const;
 
-    void addContext(Core::Id id);
+    void addContext(Utils::Id id);
 
     // IEditor
     Core::IDocument *document() const override;
@@ -204,6 +204,10 @@ public:
 
     void appendStandardContextMenuActions(QMenu *menu);
 
+    uint optionalActions();
+    void setOptionalActions(uint optionalActions);
+    void addOptionalActions(uint optionalActions);
+
     void setAutoCompleter(AutoCompleter *autoCompleter);
     AutoCompleter *autoCompleter() const;
 
@@ -298,8 +302,8 @@ public:
     virtual void extraAreaMouseEvent(QMouseEvent *);
     void updateFoldingHighlight(const QPoint &pos);
 
-    void setLanguageSettingsId(Core::Id settingsId);
-    Core::Id languageSettingsId() const;
+    void setLanguageSettingsId(Utils::Id settingsId);
+    Utils::Id languageSettingsId() const;
 
     void setCodeStyle(ICodeStylePreferences *settings);
 
@@ -310,21 +314,21 @@ public:
     void ensureCursorVisible();
     void ensureBlockIsUnfolded(QTextBlock block);
 
-    static Core::Id FakeVimSelection;
-    static Core::Id SnippetPlaceholderSelection;
-    static Core::Id CurrentLineSelection;
-    static Core::Id ParenthesesMatchingSelection;
-    static Core::Id AutoCompleteSelection;
-    static Core::Id CodeWarningsSelection;
-    static Core::Id CodeSemanticsSelection;
-    static Core::Id UndefinedSymbolSelection;
-    static Core::Id UnusedSymbolSelection;
-    static Core::Id OtherSelection;
-    static Core::Id ObjCSelection;
-    static Core::Id DebuggerExceptionSelection;
-
-    void setExtraSelections(Core::Id kind, const QList<QTextEdit::ExtraSelection> &selections);
-    QList<QTextEdit::ExtraSelection> extraSelections(Core::Id kind) const;
+    static Utils::Id FakeVimSelection;
+    static Utils::Id SnippetPlaceholderSelection;
+    static Utils::Id CurrentLineSelection;
+    static Utils::Id ParenthesesMatchingSelection;
+    static Utils::Id AutoCompleteSelection;
+    static Utils::Id CodeWarningsSelection;
+    static Utils::Id CodeSemanticsSelection;
+    static Utils::Id UndefinedSymbolSelection;
+    static Utils::Id UnusedSymbolSelection;
+    static Utils::Id OtherSelection;
+    static Utils::Id ObjCSelection;
+    static Utils::Id DebuggerExceptionSelection;
+
+    void setExtraSelections(Utils::Id kind, const QList<QTextEdit::ExtraSelection> &selections);
+    QList<QTextEdit::ExtraSelection> extraSelections(Utils::Id kind) const;
     QString extraSelectionTooltip(int pos) const;
 
     RefactorMarkers refactorMarkers() const;
@@ -453,6 +457,7 @@ public:
     void openLinkUnderCursorInNextSplit();
 
     virtual void findUsages();
+    virtual void renameSymbolUnderCursor();
 
     /// Abort code assistant if it is running.
     void abortAssist();
@@ -490,6 +495,8 @@ signals:
     void requestLinkAt(const QTextCursor &cursor, Utils::ProcessLinkCallback &callback,
                        bool resolveTarget, bool inNextSplit);
     void requestUsages(const QTextCursor &cursor);
+    void requestRename(const QTextCursor &cursor);
+    void optionalActionMaskChanged();
 
 protected:
     QTextBlock blockForVisibleRow(int row) const;
@@ -536,7 +543,7 @@ protected:
     virtual void triggerPendingUpdates();
     virtual void applyFontSettings();
 
-    void showDefaultContextMenu(QContextMenuEvent *e, Core::Id menuContextId);
+    void showDefaultContextMenu(QContextMenuEvent *e, Utils::Id menuContextId);
     virtual void finalizeInitialization() {}
     virtual void finalizeInitializationAfterDuplication(TextEditorWidget *) {}
     static QTextCursor flippedCursor(const QTextCursor &cursor);
@@ -545,7 +552,7 @@ public:
     QString selectedText() const;
 
     void setupGenericHighlighter();
-    void setupFallBackEditor(Core::Id id);
+    void setupFallBackEditor(Utils::Id id);
 
     void remove(int length);
     void replace(int length, const QString &string);