diff options
author | jkobus <jaroslaw.kobus@digia.com> | 2013-08-14 13:52:13 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2013-08-29 08:54:04 +0200 |
commit | 33a7952745571576fb955fd33bc96e86f0e456fd (patch) | |
tree | e9eae74813d85ce1bcb75fbe73d9d4916ce62531 /src/plugins/diffeditor/diffeditorwidget.h | |
parent | a06da47d5b74f9d680b2201e218c1df87f023faa (diff) | |
download | qt-creator-33a7952745571576fb955fd33bc96e86f0e456fd.tar.gz |
Implement syntax highlighting in diff editor
All Qt Creator's main highlighters are used in the first place,
for other mimetypes generic highlighter is used as a fallback.
Task-number: QTCREATORBUG-9580
Change-Id: I863b9085520e5bdda142ce88f2074afeacee0531
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorwidget.h')
-rw-r--r-- | src/plugins/diffeditor/diffeditorwidget.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/diffeditor/diffeditorwidget.h b/src/plugins/diffeditor/diffeditorwidget.h index 3b82a4ccba..fe324c3eb1 100644 --- a/src/plugins/diffeditor/diffeditorwidget.h +++ b/src/plugins/diffeditor/diffeditorwidget.h @@ -37,7 +37,6 @@ namespace TextEditor { class BaseTextEditorWidget; -class SnippetEditorWidget; class FontSettings; } @@ -98,8 +97,8 @@ signals: void navigatedToDiffFile(int diffFileIndex); protected: - TextEditor::SnippetEditorWidget *leftEditor() const; - TextEditor::SnippetEditorWidget *rightEditor() const; + TextEditor::BaseTextEditorWidget *leftEditor() const; + TextEditor::BaseTextEditorWidget *rightEditor() const; private slots: void setFontSettings(const TextEditor::FontSettings &fontSettings); |