Get rid of the QmlJS prefix.

src/plugins/qmljseditor/qmlcodecompletion.cpp

@@ -402,7 +402,7 @@ void FunctionArgumentWidget::updateArgumentHighlight()
     QString str = m_editor->textAt(m_startpos, curpos - m_startpos);
     int argnr = 0;
     int parcount = 0;
-    QmlJSScanner tokenize;
+    Scanner tokenize;
     const QList<Token> tokens = tokenize(str);
     for (int i = 0; i < tokens.count(); ++i) {
         const Token &tk = tokens.at(i);
@@ -557,7 +557,7 @@ bool QmlCodeCompletion::triggersCompletion(TextEditor::ITextEditable *editor)
             const int blockState = qMax(0, block.previous().userState()) & 0xff;
             const QString blockText = block.text();
 
-            QmlJSScanner scanner;
+            Scanner scanner;
             const QList<Token> tokens = scanner(blockText, blockState);
             foreach (const Token &tk, tokens) {
                 if (column >= tk.begin() && column <= tk.end()) {

src/plugins/qmljseditor/qmlexpressionundercursor.cpp

@@ -45,7 +45,7 @@ namespace QmlJSEditor {
         class ExpressionUnderCursor
         {
             QTextCursor _cursor;
-            QmlJSScanner scanner;
+            Scanner scanner;
 
         public:
             ExpressionUnderCursor()

src/plugins/qmljseditor/qmljseditor.cpp

@@ -1048,7 +1048,7 @@ bool QmlJSTextEditor::contextAllowsAutoParentheses(const QTextCursor &cursor, co
     const QString blockText = cursor.block().text();
     const int blockState = blockStartState(cursor.block());
 
-    QmlJSScanner tokenize;
+    Scanner tokenize;
     const QList<Token> tokens = tokenize(blockText, blockState);
     const int pos = cursor.columnNumber();
 

src/plugins/qmljseditor/qmljshighlighter.h

@@ -94,7 +94,7 @@ private:
     bool m_qmlEnabled;
     int m_braceDepth;
 
-    QmlJS::QmlJSScanner m_scanner;
+    QmlJS::Scanner m_scanner;
     Parentheses m_currentBlockParentheses;
 
     QTextCharFormat m_formats[NumFormats];