Changed the QScriptHighlighter & QScriptIndenter namespaces.

src/plugins/qmljseditor/qmlhighlighter.cpp

@@ -35,7 +35,7 @@ using namespace QmlJSEditor;
 using namespace QmlJSEditor::Internal;
 
 QmlHighlighter::QmlHighlighter(QTextDocument *parent) :
-     SharedTools::QScriptHighlighter(true, parent)
+     QmlJS::QScriptHighlighter(true, parent)
 {
     m_currentBlockParentheses.reserve(20);
     m_braceDepth = 0;

src/plugins/qmljseditor/qmlhighlighter.h

@@ -30,7 +30,7 @@
 #ifndef QMLSYNTAXHIGHLIGHTER_H
 #define QMLSYNTAXHIGHLIGHTER_H
 
-#include <qscripthighlighter/qscripthighlighter.h>
+#include <qmljs/qscripthighlighter.h>
 #include <texteditor/basetexteditor.h>
 
 namespace QmlJSEditor {
@@ -40,7 +40,7 @@ namespace Internal {
 // the parentheses encountered in the block data
 // for parentheses matching to work.
 
-class QmlHighlighter : public SharedTools::QScriptHighlighter
+class QmlHighlighter : public QmlJS::QScriptHighlighter
 {
     Q_OBJECT
 public:

src/plugins/qmljseditor/qmljseditor.cpp

@@ -37,7 +37,7 @@
 #include "qmllookupcontext.h"
 #include "qmlresolveexpression.h"
 
-#include <qscripthighlighter/qscriptindenter.h>
+#include <qmljs/qscriptindenter.h>
 
 #include <qmljs/qmltypesystem.h>
 #include <qmljs/parser/qmljsastvisitor_p.h>
@@ -77,7 +77,6 @@ enum {
 using namespace Qml;
 using namespace QmlJS;
 using namespace QmlJS::AST;
-using namespace SharedTools;
 
 namespace {
 int blockBraceDepth(const QTextBlock &block)
@@ -633,7 +632,7 @@ bool QmlJSTextEditor::isClosingBrace(const QList<QScriptIncrementalScanner::Toke
 void QmlJSTextEditor::indentBlock(QTextDocument *doc, QTextBlock block, QChar typedChar)
 {
     TextEditor::TabSettings ts = tabSettings();
-    SharedTools::QScriptIndenter indenter;
+    QScriptIndenter indenter;
     indenter.setTabSize(ts.m_tabSize);
     indenter.setIndentSize(ts.m_indentSize);
 

src/plugins/qmljseditor/qmljseditor.h

@@ -31,7 +31,7 @@
 #define QMLJSEDITOR_H
 
 #include <qmljs/qmldocument.h>
-#include <qscripthighlighter/qscriptincrementalscanner.h>
+#include <qmljs/qscriptincrementalscanner.h>
 #include <texteditor/basetexteditor.h>
 
 QT_BEGIN_NAMESPACE
@@ -145,7 +145,7 @@ protected:
 private:
     virtual bool isElectricCharacter(const QChar &ch) const;
     virtual void indentBlock(QTextDocument *doc, QTextBlock block, QChar typedChar);
-    bool isClosingBrace(const QList<SharedTools::QScriptIncrementalScanner::Token> &tokens) const;
+    bool isClosingBrace(const QList<QmlJS::QScriptIncrementalScanner::Token> &tokens) const;
 
     QString wordUnderCursor() const;
 

src/plugins/qmljseditor/qmljseditor.pro

@@ -3,10 +3,6 @@ TARGET = QmlJSEditor
 include(../../qtcreatorplugin.pri)
 include(qmljseditor_dependencies.pri)
 
-include(../../shared/qscripthighlighter/qscripthighlighter.pri)
-DEPENDPATH += ../../shared/qscripthighlighter
-
-
 CONFIG += help
 DEFINES += \
     QMLJSEDITOR_LIBRARY \