feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Simplify configuring generic highlighter

Browse Source 
* configureMimeType -> configureGenericHighlighter, since that is what
  it actually does.
* setupAsPlainEditor -> setupGenericHighlighter, since that is what it
  actually does
* avoid multiple highlighting definition lookups
* unify code paths by not separately creating generic highlighters
  through the factories

Change-Id: I9579ca5736bbf08c01b8e41b63c6b9f36bdc725e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-02-03 09:18:57 +01:00
parent 2aa315d05c
commit e7fb05e038
12 changed files with 37 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/texteditor/texteditor.h
View File

@@ -468,8 +468,7 @@ public:
/// Abort code assistant if it is running.
void abortAssist();
void configureMimeType(const QString &mimeType);
void configureMimeType(const Core::MimeType &mimeType);
void configureGenericHighlighter();
Q_INVOKABLE void inSnippetMode(bool *active); // Used by FakeVim.
@@ -559,7 +558,7 @@ public:
QString selectedText() const;
void setupAsPlainEditor();
void setupGenericHighlighter();
void setupFallBackEditor(Core::Id id);
void remove(int length);
@@ -664,8 +663,7 @@ public:
void setEditorCreator(const EditorCreator &creator);
void setIndenterCreator(const IndenterCreator &creator);
void setSyntaxHighlighterCreator(const SyntaxHighLighterCreator &creator);
void setGenericSyntaxHighlighter(const QString &mimeType);
void setGenericSyntaxHighlighterByName(const QString &name);
void setUseGenericHighlighter(bool enabled);
void setAutoCompleterCreator(const AutoCompleterCreator &creator);
void setEditorActionHandlers(Core::Id contextId, uint optionalActions);