Merge qmljshighlighter.* with qmlhighlighter.*.

This commit is contained in:
Roberto Raggi
2010-02-15 12:27:25 +01:00
parent 3d34ce42f7
commit 8fb82ef792
9 changed files with 170 additions and 253 deletions

View File

@@ -49,7 +49,7 @@ class QmlModelManagerInterface;
namespace Internal {
class QmlHighlighter;
class Highlighter;
class QmlJSTextEditor;
class QmlJSEditorEditable : public TextEditor::BaseTextEditorEditable
@@ -180,6 +180,8 @@ private:
QComboBox *m_methodCombo;
QmlModelManagerInterface *m_modelManager;
QTextCharFormat m_occurrencesFormat;
QTextCharFormat m_occurrencesUnusedFormat;
QTextCharFormat m_occurrenceRenameFormat;
SemanticInfo m_semanticInfo;
};