From fd26a8c8ec52cb556b40d51f0865d26eea763d7d Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 15 Feb 2010 12:56:03 +0100
Subject: [PATCH] Get rid of the QmlJS prefix.
---
src/libs/qmljs/qmljsindenter.cpp | 2 +-
src/libs/qmljs/qmljsscanner.cpp | 14 +++++++-------
src/libs/qmljs/qmljsscanner.h | 6 +++---
src/plugins/qmljseditor/qmlcodecompletion.cpp | 4 ++--
.../qmljseditor/qmlexpressionundercursor.cpp | 2 +-
src/plugins/qmljseditor/qmljseditor.cpp | 2 +-
src/plugins/qmljseditor/qmljshighlighter.h | 2 +-
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/libs/qmljs/qmljsindenter.cpp b/src/libs/qmljs/qmljsindenter.cpp
index 4286c649eb6..aa200e01034 100644
--- a/src/libs/qmljs/qmljsindenter.cpp
+++ b/src/libs/qmljs/qmljsindenter.cpp
@@ -205,7 +205,7 @@ void QmlJSIndenter::eraseChar(QString &t, int k, QChar ch) const
*/
QString QmlJSIndenter::trimmedCodeLine(const QString &t)
{
- QmlJSScanner scanner;
+ Scanner scanner;
QTextBlock currentLine = yyLinizerState.iter;
int startState = qMax(0, currentLine.previous().userState()) & 0xff;
diff --git a/src/libs/qmljs/qmljsscanner.cpp b/src/libs/qmljs/qmljsscanner.cpp
index 8567bf60026..c1c0b2b44e4 100644
--- a/src/libs/qmljs/qmljsscanner.cpp
+++ b/src/libs/qmljs/qmljsscanner.cpp
@@ -76,22 +76,22 @@ const _Tp *end(const _Tp (&a)[N])
return a + N;
}
-QmlJSScanner::QmlJSScanner()
+Scanner::Scanner()
: _state(0),
_scanComments(true)
{
}
-QmlJSScanner::~QmlJSScanner()
+Scanner::~Scanner()
{
}
-bool QmlJSScanner::scanComments() const
+bool Scanner::scanComments() const
{
return _scanComments;
}
-void QmlJSScanner::setScanComments(bool scanComments)
+void Scanner::setScanComments(bool scanComments)
{
_scanComments = scanComments;
}
@@ -120,7 +120,7 @@ static bool isNumberChar(QChar ch)
}
}
-QList<Token> QmlJSScanner::operator()(const QString &text, int startState)
+QList<Token> Scanner::operator()(const QString &text, int startState)
{
enum {
Normal = 0,
@@ -297,12 +297,12 @@ QList<Token> QmlJSScanner::operator()(const QString &text, int startState)
return tokens;
}
-int QmlJSScanner::state() const
+int Scanner::state() const
{
return _state;
}
-bool QmlJSScanner::isKeyword(const QString &text) const
+bool Scanner::isKeyword(const QString &text) const
{
if (qBinaryFind(begin(js_keywords), end(js_keywords), text) != end(js_keywords))
return true;
diff --git a/src/libs/qmljs/qmljsscanner.h b/src/libs/qmljs/qmljsscanner.h
index 3c3c12b360f..8c240d3c479 100644
--- a/src/libs/qmljs/qmljsscanner.h
+++ b/src/libs/qmljs/qmljsscanner.h
@@ -74,11 +74,11 @@ public:
Kind kind;
};
-class QMLJS_EXPORT QmlJSScanner
+class QMLJS_EXPORT Scanner
{
public:
- QmlJSScanner();
- virtual ~QmlJSScanner();
+ Scanner();
+ virtual ~Scanner();
bool scanComments() const;
void setScanComments(bool scanComments);
diff --git a/src/plugins/qmljseditor/qmlcodecompletion.cpp b/src/plugins/qmljseditor/qmlcodecompletion.cpp
index e24a6b50fe7..116b9390397 100644
--- a/src/plugins/qmljseditor/qmlcodecompletion.cpp
+++ b/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()) {
diff --git a/src/plugins/qmljseditor/qmlexpressionundercursor.cpp b/src/plugins/qmljseditor/qmlexpressionundercursor.cpp
index 30fff086c9c..47be306a23a 100644
--- a/src/plugins/qmljseditor/qmlexpressionundercursor.cpp
+++ b/src/plugins/qmljseditor/qmlexpressionundercursor.cpp
@@ -45,7 +45,7 @@ namespace QmlJSEditor {
class ExpressionUnderCursor
{
QTextCursor _cursor;
- QmlJSScanner scanner;
+ Scanner scanner;
public:
ExpressionUnderCursor()
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 7428113f0a0..f4348012975 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/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();
diff --git a/src/plugins/qmljseditor/qmljshighlighter.h b/src/plugins/qmljseditor/qmljshighlighter.h
index 68c2a1e472c..75b74d23ba8 100644
--- a/src/plugins/qmljseditor/qmljshighlighter.h
+++ b/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];
--
GitLab