summaryrefslogtreecommitdiff
path: root/src/plugins/texteditor/basetextdocument.h
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2010-07-09 14:47:18 +0200
committerRoberto Raggi <roberto.raggi@nokia.com>2010-07-09 14:47:18 +0200
commit8acde74d79672137366258c79eb512a2fbcfac8e (patch)
tree529c21db030126365f775ac05857ebb48591e8cf /src/plugins/texteditor/basetextdocument.h
parent32993f460a4bb44b14964e5379f8c9036481aa93 (diff)
downloadqt-creator-8acde74d79672137366258c79eb512a2fbcfac8e.tar.gz
Forked QSyntaxHighlighter from Qt 4.7.
We need our very own syntax highlighter in Qt Creator.
Diffstat (limited to 'src/plugins/texteditor/basetextdocument.h')
-rw-r--r--src/plugins/texteditor/basetextdocument.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/texteditor/basetextdocument.h b/src/plugins/texteditor/basetextdocument.h
index 7447d8167d..cd503276b3 100644
--- a/src/plugins/texteditor/basetextdocument.h
+++ b/src/plugins/texteditor/basetextdocument.h
@@ -40,11 +40,12 @@
QT_BEGIN_NAMESPACE
class QTextCursor;
class QTextDocument;
-class QSyntaxHighlighter;
QT_END_NAMESPACE
namespace TextEditor {
+class SyntaxHighlighter;
+
class DocumentMarker : public ITextMarkable
{
Q_OBJECT
@@ -101,8 +102,8 @@ public:
virtual void reload();
QTextDocument *document() const { return m_document; }
- void setSyntaxHighlighter(QSyntaxHighlighter *highlighter);
- QSyntaxHighlighter *syntaxHighlighter() const { return m_highlighter; }
+ void setSyntaxHighlighter(SyntaxHighlighter *highlighter);
+ SyntaxHighlighter *syntaxHighlighter() const { return m_highlighter; }
inline bool isBinaryData() const { return m_isBinaryData; }
@@ -127,7 +128,7 @@ private:
TabSettings m_tabSettings;
QTextDocument *m_document;
DocumentMarker *m_documentMarker;
- QSyntaxHighlighter *m_highlighter;
+ SyntaxHighlighter *m_highlighter;
enum LineTerminatorMode {
LFLineTerminator,