summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/parser/qmljslexer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/qml/parser/qmljslexer.cpp')
-rw-r--r--src/declarative/qml/parser/qmljslexer.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/declarative/qml/parser/qmljslexer.cpp b/src/declarative/qml/parser/qmljslexer.cpp
index e9ea604..cf3ed34 100644
--- a/src/declarative/qml/parser/qmljslexer.cpp
+++ b/src/declarative/qml/parser/qmljslexer.cpp
@@ -49,7 +49,7 @@
#include "qmljsengine_p.h"
#include "qmljsgrammar_p.h"
-#include <QtGui/qapplication.h>
+#include <QtCore/qcoreapplication.h>
#include <ctype.h>
#include <stdlib.h>
@@ -551,7 +551,7 @@ int Lexer::lex()
else {
setDone(Bad);
err = IllegalCharacter;
- errmsg = qApp->translate("QmlParser", "Illegal character");
+ errmsg = QCoreApplication::translate("QmlParser", "Illegal character");
}
}
break;
@@ -565,7 +565,7 @@ int Lexer::lex()
} else if (current == 0 || isLineTerminator()) {
setDone(Bad);
err = UnclosedStringLiteral;
- errmsg = qApp->translate("QmlParser", "Unclosed string at end of line");
+ errmsg = QCoreApplication::translate("QmlParser", "Unclosed string at end of line");
} else if (current == '\\') {
state = InEscapeSequence;
} else {
@@ -591,7 +591,7 @@ int Lexer::lex()
} else {
setDone(Bad);
err = IllegalEscapeSequence;
- errmsg = qApp->translate("QmlParser", "Illegal escape squence");
+ errmsg = QCoreApplication::translate("QmlParser", "Illegal escape squence");
}
} else if (current == 'x')
state = InHexEscape;
@@ -637,7 +637,7 @@ int Lexer::lex()
} else {
setDone(Bad);
err = IllegalUnicodeEscapeSequence;
- errmsg = qApp->translate("QmlParser", "Illegal unicode escape sequence");
+ errmsg = QCoreApplication::translate("QmlParser", "Illegal unicode escape sequence");
}
break;
case InSingleLineComment:
@@ -663,7 +663,7 @@ int Lexer::lex()
if (current == 0) {
setDone(Bad);
err = UnclosedComment;
- errmsg = qApp->translate("QmlParser", "Unclosed comment at end of file");
+ errmsg = QCoreApplication::translate("QmlParser", "Unclosed comment at end of file");
driver->addComment(startpos, tokenLength(), startlineno, startcolumn);
} else if (isLineTerminator()) {
shiftWindowsLineBreak();
@@ -750,7 +750,7 @@ int Lexer::lex()
} else {
setDone(Bad);
err = IllegalExponentIndicator;
- errmsg = qApp->translate("QmlParser", "Illegal syntax for exponential number");
+ errmsg = QCoreApplication::translate("QmlParser", "Illegal syntax for exponential number");
}
break;
case InExponent:
@@ -776,7 +776,7 @@ int Lexer::lex()
&& isIdentLetter(current)) {
state = Bad;
err = IllegalIdentifier;
- errmsg = qApp->translate("QmlParser", "Identifier cannot start with numeric literal");
+ errmsg = QCoreApplication::translate("QmlParser", "Identifier cannot start with numeric literal");
}
// terminate string
@@ -1107,7 +1107,7 @@ bool Lexer::scanRegExp(RegExpBodyPrefix prefix)
while (1) {
if (isLineTerminator() || current == 0) {
- errmsg = qApp->translate("QmlParser", "Unterminated regular expression literal");
+ errmsg = QCoreApplication::translate("QmlParser", "Unterminated regular expression literal");
return false;
}
else if (current != '/' || lastWasEscape == true)
@@ -1131,7 +1131,7 @@ bool Lexer::scanRegExp(RegExpBodyPrefix prefix)
while (isIdentLetter(current)) {
int flag = Ecma::RegExp::flagFromChar(current);
if (flag == 0) {
- errmsg = qApp->translate("QmlParser", "Invalid regular expression flag '%0'")
+ errmsg = QCoreApplication::translate("QmlParser", "Invalid regular expression flag '%0'")
.arg(QChar(current));
return false;
}