Highlighting and more sensible watchers to qml inspector

src/plugins/qmljseditor/qmljseditor.h

@@ -50,10 +50,10 @@ class ICore;
 namespace QmlJSEditor {
 
 class ModelManagerInterface;
+class Highlighter;
 
 namespace Internal {
 
-class Highlighter;
 class QmlJSTextEditor;
 
 class QmlJSEditorEditable : public TextEditor::BaseTextEditorEditable

src/plugins/qmljseditor/qmljshighlighter.cpp

@@ -36,7 +36,6 @@
 #include <utils/qtcassert.h>
 
 using namespace QmlJSEditor;
-using namespace QmlJSEditor::Internal;
 using namespace QmlJS;
 
 Highlighter::Highlighter(QTextDocument *parent)

src/plugins/qmljseditor/qmljshighlighter.h

@@ -30,6 +30,8 @@
 #ifndef QSCRIPTSYNTAXHIGHLIGHTER_H
 #define QSCRIPTSYNTAXHIGHLIGHTER_H
 
+#include "qmljseditor_global.h"
+
 #include <qmljs/qmljsscanner.h>
 
 #include <QtCore/QVector>
@@ -39,9 +41,8 @@
 #include <texteditor/basetexteditor.h>
 
 namespace QmlJSEditor {
-namespace Internal {
 
-class Highlighter : public QSyntaxHighlighter
+class QMLJSEDITOR_EXPORT Highlighter : public QSyntaxHighlighter
 {
     Q_OBJECT
 
@@ -100,7 +101,6 @@ private:
     QTextCharFormat m_formats[NumFormats];
 };
 
-} // end of namespace Internal
 } // end of namespace QmlJSEditor
 
 #endif // QSCRIPTSYNTAXHIGHLIGHTER_H