Qml: replace QStringLiteral with QLatin1String

... in string comparisons. It's more efficient.

Change-Id: I3be5a2be9ba5d55546472eac28f5f639a496bf3b
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

9 files changed, 29 insertions, 29 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index 9fcfe53b05..a34c1cbf0e 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -411,7 +411,7 @@ bool IRBuilder::generateFromQml(const QString &code, const QString &url, Documen
 bool IRBuilder::isSignalPropertyName(const QString &name)
 {
     if (name.length() < 3) return false;
-    if (!name.startsWith(QStringLiteral("on"))) return false;
+    if (!name.startsWith(QLatin1String("on"))) return false;
     int ns = name.length();
     for (int i = 2; i < ns; ++i) {
         const QChar curr = name.at(i);
@@ -1061,7 +1061,7 @@ void IRBuilder::appendBinding(QQmlJS::AST::UiQualifiedId *name, QQmlJS::AST::Sta
     Object *object = 0;
     if (!resolveQualifiedId(&name, &object))
         return;
-    if (_object == object && name->name == QStringLiteral("id")) {
+    if (_object == object && name->name == QLatin1String("id")) {
         setId(name->identifierToken, value);
         return;
     }
@@ -1097,7 +1097,7 @@ void IRBuilder::appendBinding(const QQmlJS::AST::SourceLocation &qualifiedNameLo
 
 void IRBuilder::appendBinding(const QQmlJS::AST::SourceLocation &qualifiedNameLocation, const QQmlJS::AST::SourceLocation &nameLocation, quint32 propertyNameIndex, int objectIndex, bool isListItem, bool isOnAssignment)
 {
-    if (stringAt(propertyNameIndex) == QStringLiteral("id")) {
+    if (stringAt(propertyNameIndex) == QLatin1String("id")) {
         recordError(nameLocation, tr("Invalid component id specification"));
         return;
     }
@@ -1192,7 +1192,7 @@ bool IRBuilder::resolveQualifiedId(QQmlJS::AST::UiQualifiedId **nameToResolve, O
 {
     QQmlJS::AST::UiQualifiedId *qualifiedIdElement = *nameToResolve;
 
-    if (qualifiedIdElement->name == QStringLiteral("id") && qualifiedIdElement->next)
+    if (qualifiedIdElement->name == QLatin1String("id") && qualifiedIdElement->next)
         COMPILE_EXCEPTION(qualifiedIdElement->identifierToken, tr( "Invalid use of id property"));
 
     // If it's a namespace, prepend the qualifier and we'll resolve it later to the correct type.
@@ -1918,7 +1918,7 @@ QQmlPropertyData *PropertyResolver::signal(const QString &name, bool *notInRevis
         return d;
     }
 
-    if (name.endsWith(QStringLiteral("Changed"))) {
+    if (name.endsWith(QLatin1String("Changed"))) {
         QString propName = name.mid(0, name.length() - static_cast<int>(strlen("Changed")));
 
         d = property(propName, notInRevision);
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp
index 2b3cd93052..a708e90116 100644
--- a/src/qml/compiler/qqmltypecompiler.cpp
+++ b/src/qml/compiler/qqmltypecompiler.cpp
@@ -972,7 +972,7 @@ bool SignalHandlerConverter::convertSignalHandlerExpressionsToFunctionDeclaratio
 
         QmlIR::PropertyResolver resolver(propertyCache);
 
-        Q_ASSERT(propertyName.startsWith(QStringLiteral("on")));
+        Q_ASSERT(propertyName.startsWith(QLatin1String("on")));
         propertyName.remove(0, 2);
 
         // Note that the property name could start with any alpha or '_' or '$' character,
@@ -1039,7 +1039,7 @@ bool SignalHandlerConverter::convertSignalHandlerExpressionsToFunctionDeclaratio
             }
 
             QHash<QString, QStringList>::ConstIterator entry = customSignals.constFind(propertyName);
-            if (entry == customSignals.constEnd() && propertyName.endsWith(QStringLiteral("Changed"))) {
+            if (entry == customSignals.constEnd() && propertyName.endsWith(QLatin1String("Changed"))) {
                 QString alternateName = propertyName.mid(0, propertyName.length() - static_cast<int>(strlen("Changed")));
                 entry = customSignals.constFind(alternateName);
             }
@@ -2749,7 +2749,7 @@ bool QQmlJavaScriptBindingExpressionSimplificationPass::simplifyBinding(QV4::IR:
 
 bool QQmlJavaScriptBindingExpressionSimplificationPass::detectTranslationCallAndConvertBinding(QmlIR::Binding *binding)
 {
-    if (*_nameOfFunctionCalled == QStringLiteral("qsTr")) {
+    if (*_nameOfFunctionCalled == QLatin1String("qsTr")) {
         QString translation;
         QV4::CompiledData::TranslationData translationData;
         translationData.number = -1;
@@ -2791,7 +2791,7 @@ bool QQmlJavaScriptBindingExpressionSimplificationPass::detectTranslationCallAnd
         binding->stringIndex = compiler->registerString(translation);
         binding->value.translationData = translationData;
         return true;
-    } else if (*_nameOfFunctionCalled == QStringLiteral("qsTrId")) {
+    } else if (*_nameOfFunctionCalled == QLatin1String("qsTrId")) {
         QString id;
         QV4::CompiledData::TranslationData translationData;
         translationData.number = -1;
@@ -2825,7 +2825,7 @@ bool QQmlJavaScriptBindingExpressionSimplificationPass::detectTranslationCallAnd
         binding->stringIndex = compiler->registerString(id);
         binding->value.translationData = translationData;
         return true;
-    } else if (*_nameOfFunctionCalled == QStringLiteral("QT_TR_NOOP") || *_nameOfFunctionCalled == QStringLiteral("QT_TRID_NOOP")) {
+    } else if (*_nameOfFunctionCalled == QLatin1String("QT_TR_NOOP") || *_nameOfFunctionCalled == QLatin1String("QT_TRID_NOOP")) {
         QVector<int>::ConstIterator param = _functionParameters.constBegin();
         QVector<int>::ConstIterator end = _functionParameters.constEnd();
         if (param == end)
@@ -2842,7 +2842,7 @@ bool QQmlJavaScriptBindingExpressionSimplificationPass::detectTranslationCallAnd
         binding->type = QV4::CompiledData::Binding::Type_String;
         binding->stringIndex = compiler->registerString(*stringParam->value);
         return true;
-    } else if (*_nameOfFunctionCalled == QStringLiteral("QT_TRANSLATE_NOOP")) {
+    } else if (*_nameOfFunctionCalled == QLatin1String("QT_TRANSLATE_NOOP")) {
         QVector<int>::ConstIterator param = _functionParameters.constBegin();
         QVector<int>::ConstIterator end = _functionParameters.constEnd();
         if (param == end)
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index eab5b7fd2d..d08d2aafa2 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -115,7 +115,7 @@ void Codegen::ScanFunctions::checkDirectivePrologue(SourceElements *ast)
                     if (strLit->literalToken.length < 2)
                         continue;
                     QStringRef str = _sourceCode.midRef(strLit->literalToken.offset + 1, strLit->literalToken.length - 2);
-                    if (str == QStringLiteral("use strict")) {
+                    if (str == QLatin1String("use strict")) {
                         _env->isStrict = true;
                     } else {
                         // TODO: give a warning.
@@ -148,7 +148,7 @@ void Codegen::ScanFunctions::checkName(const QStringRef &name, const SourceLocat
 void Codegen::ScanFunctions::checkForArguments(AST::FormalParameterList *parameters)
 {
     while (parameters) {
-        if (parameters->name == QStringLiteral("arguments"))
+        if (parameters->name == QLatin1String("arguments"))
             _env->usesArgumentsObject = Environment::ArgumentsObjectNotUsed;
         parameters = parameters->next;
     }
@@ -170,7 +170,7 @@ bool Codegen::ScanFunctions::visit(CallExpression *ast)
 {
     if (! _env->hasDirectEval) {
         if (IdentifierExpression *id = cast<IdentifierExpression *>(ast->base)) {
-            if (id->name == QStringLiteral("eval")) {
+            if (id->name == QLatin1String("eval")) {
                 if (_env->usesArgumentsObject == Environment::ArgumentsObjectUnknown)
                     _env->usesArgumentsObject = Environment::ArgumentsObjectUsed;
                 _env->hasDirectEval = true;
@@ -241,7 +241,7 @@ bool Codegen::ScanFunctions::visit(ExpressionStatement *ast)
         return false;
     } else {
         SourceLocation firstToken = ast->firstSourceLocation();
-        if (_sourceCode.midRef(firstToken.offset, firstToken.length) == QStringLiteral("function")) {
+        if (_sourceCode.midRef(firstToken.offset, firstToken.length) == QLatin1String("function")) {
             _cg->throwSyntaxError(firstToken, QStringLiteral("unexpected token"));
         }
     }
@@ -1441,7 +1441,7 @@ IR::Expr *Codegen::identifier(const QString &name, int line, int col)
         Q_ASSERT (index < e->members.size());
         if (index != -1) {
             IR::ArgLocal *al = _block->LOCAL(index, scope);
-            if (name == QStringLiteral("arguments") || name == QStringLiteral("eval"))
+            if (name == QLatin1String("arguments") || name == QLatin1String("eval"))
                 al->isArgumentsOrEval = true;
             return al;
         }
diff --git a/src/qml/compiler/qv4isel_p.cpp b/src/qml/compiler/qv4isel_p.cpp
index 49e7d5c66e..0ae08160ab 100644
--- a/src/qml/compiler/qv4isel_p.cpp
+++ b/src/qml/compiler/qv4isel_p.cpp
@@ -95,7 +95,7 @@ void IRDecoder::visitMove(IR::Move *s)
         }
     } else if (s->target->asTemp() || s->target->asArgLocal()) {
         if (IR::Name *n = s->source->asName()) {
-            if (n->id && *n->id == QStringLiteral("this")) // TODO: `this' should be a builtin.
+            if (n->id && *n->id == QLatin1String("this")) // TODO: `this' should be a builtin.
                 loadThisObject(s->target);
             else if (n->builtin == IR::Name::builtin_qml_context)
                 loadQmlContext(s->target);
diff --git a/src/qml/compiler/qv4jsir.cpp b/src/qml/compiler/qv4jsir.cpp
index c2b6fa477b..4c87b7557e 100644
--- a/src/qml/compiler/qv4jsir.cpp
+++ b/src/qml/compiler/qv4jsir.cpp
@@ -1145,7 +1145,7 @@ void IRPrinter::visitRegExp(RegExp *e)
 void IRPrinter::visitName(Name *e)
 {
     if (e->id) {
-        if (*e->id != QStringLiteral("this"))
+        if (*e->id != QLatin1String("this"))
             *out << '.';
         *out << *e->id;
     } else {
diff --git a/src/qml/compiler/qv4ssa.cpp b/src/qml/compiler/qv4ssa.cpp
index 62ec204aff..7881ab951a 100644
--- a/src/qml/compiler/qv4ssa.cpp
+++ b/src/qml/compiler/qv4ssa.cpp
@@ -2070,7 +2070,7 @@ protected:
             return;
         // TODO: maybe we can distinguish between built-ins of which we know that they do not have
         // a side-effect.
-        if (e->builtin == Name::builtin_invalid || (e->id && *e->id != QStringLiteral("this")))
+        if (e->builtin == Name::builtin_invalid || (e->id && *e->id != QLatin1String("this")))
             markAsSideEffect();
     }
 
diff --git a/src/qml/debugger/qqmldebugconnector.cpp b/src/qml/debugger/qqmldebugconnector.cpp
index f00d4b24f7..6edd28ea01 100644
--- a/src/qml/debugger/qqmldebugconnector.cpp
+++ b/src/qml/debugger/qqmldebugconnector.cpp
@@ -129,7 +129,7 @@ QQmlDebugConnector *QQmlDebugConnector::instance()
     if (!params->instance) {
         const QString serverConnector = QStringLiteral("QQmlDebugServer");
         const QString nativeConnector = QStringLiteral("QQmlNativeDebugConnector");
-        const bool isNative = params->arguments.startsWith(QStringLiteral("native"));
+        const bool isNative = params->arguments.startsWith(QLatin1String("native"));
         if (!params->pluginKey.isEmpty()) {
             if (params->pluginKey == serverConnector || params->pluginKey == nativeConnector)
                 params->instance = loadQQmlDebugConnector(params->pluginKey);
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index b516cc7d89..1a7896bde8 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -640,7 +640,7 @@ void QQmlObjectCreator::setupBindings(const QBitArray &bindingsToSkip)
 
     if (_compiledObject->idIndex) {
         const QQmlPropertyData *idProperty = propertyData.last();
-        Q_ASSERT(!idProperty || !idProperty->isValid() || idProperty->name(_qobject) == QStringLiteral("id"));
+        Q_ASSERT(!idProperty || !idProperty->isValid() || idProperty->name(_qobject) == QLatin1String("id"));
         if (idProperty && idProperty->isValid() && idProperty->isWritable() && idProperty->propType == QMetaType::QString) {
             QV4::CompiledData::Binding idBinding;
             idBinding.propertyNameIndex = 0; // Not used
diff --git a/src/qml/qml/qqmlscriptstring.cpp b/src/qml/qml/qqmlscriptstring.cpp
index b027f043ec..3230e69b6d 100644
--- a/src/qml/qml/qqmlscriptstring.cpp
+++ b/src/qml/qml/qqmlscriptstring.cpp
@@ -135,10 +135,10 @@ bool QQmlScriptString::operator==(const QQmlScriptString &other) const
     if (d->isStringLiteral || other.d->isStringLiteral)
         return d->isStringLiteral && other.d->isStringLiteral && d->script == other.d->script;
 
-    if (d->script == QStringLiteral("true") ||
-        d->script == QStringLiteral("false") ||
-        d->script == QStringLiteral("undefined") ||
-        d->script == QStringLiteral("null"))
+    if (d->script == QLatin1String("true") ||
+        d->script == QLatin1String("false") ||
+        d->script == QLatin1String("undefined") ||
+        d->script == QLatin1String("null"))
         return d->script == other.d->script;
 
     return d->context == other.d->context &&
@@ -172,7 +172,7 @@ Returns whether the content of the QQmlScriptString is the \c undefined literal.
 */
 bool QQmlScriptString::isUndefinedLiteral() const
 {
-    return d->script == QStringLiteral("undefined");
+    return d->script == QLatin1String("undefined");
 }
 
 /*!
@@ -180,7 +180,7 @@ Returns whether the content of the QQmlScriptString is the \c null literal.
 */
 bool QQmlScriptString::isNullLiteral() const
 {
-    return d->script == QStringLiteral("null");
+    return d->script == QLatin1String("null");
 }
 
 /*!
@@ -211,8 +211,8 @@ sets \a ok to true. Otherwise returns false and sets \a ok to false.
 */
 bool QQmlScriptString::booleanLiteral(bool *ok) const
 {
-    bool isTrue = d->script == QStringLiteral("true");
-    bool isFalse = !isTrue && d->script == QStringLiteral("false");
+    bool isTrue = d->script == QLatin1String("true");
+    bool isFalse = !isTrue && d->script == QLatin1String("false");
     if (ok)
         *ok = isTrue || isFalse;
     return isTrue ? true : false;