Scrape off some more allocations by using the QStringBuilder

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

6 files changed, 16 insertions, 30 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index d4757bed39..6b83bdc7b6 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -900,10 +900,8 @@ bool IRBuilder::visit(QQmlJS::AST::UiPublicMember *node)
              property->aliasIdValueIndex = registerString(alias.first());
 
              QString propertyValue = alias.value(1);
-             if (alias.count() == 3) {
-                 propertyValue += QLatin1Char('.');
-                 propertyValue += alias.at(2);
-             }
+             if (alias.count() == 3)
+                 propertyValue += QLatin1Char('.') + alias.at(2);
              property->aliasPropertyValueIndex = registerString(propertyValue);
         }
         QQmlJS::AST::SourceLocation errorLocation;
@@ -1201,8 +1199,7 @@ bool IRBuilder::resolveQualifiedId(QQmlJS::AST::UiQualifiedId **nameToResolve, O
             if (import->qualifierIndex != emptyStringIndex
                 && stringAt(import->qualifierIndex) == currentName) {
                 qualifiedIdElement = qualifiedIdElement->next;
-                currentName += QLatin1Char('.');
-                currentName += qualifiedIdElement->name;
+                currentName += QLatin1Char('.') + qualifiedIdElement->name;
 
                 if (!qualifiedIdElement->name.unicode()->isUpper())
                     COMPILE_EXCEPTION(qualifiedIdElement->firstSourceLocation(), tr("Expected type name"));
diff --git a/src/qml/jsruntime/qv4errorobject.cpp b/src/qml/jsruntime/qv4errorobject.cpp
index 9f1e6b613b..2db04bbfda 100644
--- a/src/qml/jsruntime/qv4errorobject.cpp
+++ b/src/qml/jsruntime/qv4errorobject.cpp
@@ -160,13 +160,9 @@ ReturnedValue ErrorObject::method_get_stack(CallContext *ctx)
             if (i > 0)
                 trace += QLatin1Char('\n');
             const StackFrame &frame = This->d()->stackTrace[i];
-            trace += frame.function;
-            trace += QLatin1Char('@');
-            trace += frame.source;
-            if (frame.line >= 0) {
-                trace += QLatin1Char(':');
-                trace += QString::number(frame.line);
-            }
+            trace += frame.function + QLatin1Char('@') + frame.source;
+            if (frame.line >= 0)
+                trace += QLatin1Char(':') + QString::number(frame.line);
         }
         This->d()->stack = ctx->d()->engine->newString(trace);
     }
diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp
index a211d46153..0ae7c33dea 100644
--- a/src/qml/jsruntime/qv4jsonobject.cpp
+++ b/src/qml/jsruntime/qv4jsonobject.cpp
@@ -590,8 +590,7 @@ bool JsonParser::parseString(QString *string)
                 return false;
             }
             if (QChar::requiresSurrogates(ch)) {
-                *string += QChar(QChar::highSurrogate(ch));
-                *string += QChar(QChar::lowSurrogate(ch));
+                *string += QChar(QChar::highSurrogate(ch)) + QChar(QChar::lowSurrogate(ch));
             } else {
                 *string += QChar(ch);
             }
@@ -672,8 +671,8 @@ static QString quote(const QString &str)
         default:
             if (c.unicode() <= 0x1f) {
                 product += QStringLiteral("\\u00");
-                product += c.unicode() > 0xf ? QLatin1Char('1') : QLatin1Char('0');
-                product += QLatin1Char("0123456789abcdef"[c.unicode() & 0xf]);
+                product += (c.unicode() > 0xf ? QLatin1Char('1') : QLatin1Char('0')) +
+                        QLatin1Char("0123456789abcdef"[c.unicode() & 0xf]);
             } else {
                 product += c;
             }
diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp
index 0727f35edd..ff3208485e 100644
--- a/src/qml/jsruntime/qv4object.cpp
+++ b/src/qml/jsruntime/qv4object.cpp
@@ -753,9 +753,8 @@ void Object::internalPut(String *name, const Value &value)
 
   reject:
     if (engine()->current->strictMode) {
-        QString message = QStringLiteral("Cannot assign to read-only property \"");
-        message += name->toQString();
-        message += QLatin1Char('\"');
+        QString message = QStringLiteral("Cannot assign to read-only property \"") +
+                name->toQString() + QLatin1Char('\"');
         engine()->throwTypeError(message);
     }
 }
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index fca218d9d0..df58ab5060 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -1768,17 +1768,13 @@ QV4::ReturnedValue QObjectMethod::method_toString(QV4::ExecutionContext *ctx) co
     QString result;
     if (const QMetaObject *metaObject = d()->metaObject()) {
 
-        result += QString::fromUtf8(metaObject->className());
-        result += QLatin1String("(0x");
-        result += QString::number((quintptr)d()->object.data(),16);
+        result += QString::fromUtf8(metaObject->className()) +
+                QLatin1String("(0x") + QString::number((quintptr)d()->object.data(),16);
 
         if (d()->object) {
             QString objectName = d()->object->objectName();
-            if (!objectName.isEmpty()) {
-                result += QLatin1String(", \"");
-                result += objectName;
-                result += QLatin1Char('\"');
-            }
+            if (!objectName.isEmpty())
+                result += QLatin1String(", \"") + objectName + QLatin1Char('\"');
         }
 
         result += QLatin1Char(')');
diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp
index 71e2bd1a06..05752dc6dc 100644
--- a/src/qml/jsruntime/qv4regexpobject.cpp
+++ b/src/qml/jsruntime/qv4regexpobject.cpp
@@ -185,8 +185,7 @@ QRegExp RegExpObject::toQRegExp() const
 
 QString RegExpObject::toString() const
 {
-    QString result = QLatin1Char('/') + source();
-    result += QLatin1Char('/');
+    QString result = QLatin1Char('/') + source() + QLatin1Char('/');
     if (global())
         result += QLatin1Char('g');
     if (value()->ignoreCase)