forked from qt-creator/qt-creator
Forked QSyntaxHighlighter from Qt 4.7.
We need our very own syntax highlighter in Qt Creator.
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user