aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/qml/jsruntime/qv4arrayobject.cpp2
-rw-r--r--src/qml/jsruntime/qv4engine_p.h2
-rw-r--r--src/qml/jsruntime/qv4errorobject.cpp2
-rw-r--r--src/qml/jsruntime/qv4regexpobject.cpp4
-rw-r--r--src/qml/jsruntime/qv4stringobject.cpp8
5 files changed, 9 insertions, 9 deletions
diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp
index ec79d0b47d..69cfcdf07a 100644
--- a/src/qml/jsruntime/qv4arrayobject.cpp
+++ b/src/qml/jsruntime/qv4arrayobject.cpp
@@ -190,7 +190,7 @@ ReturnedValue ArrayPrototype::method_join(CallContext *ctx)
const quint32 r2 = length->isUndefined() ? 0 : length->toUInt32();
if (!r2)
- return ctx->d()->engine->newString(QString())->asReturnedValue();
+ return ctx->d()->engine->newString()->asReturnedValue();
QString R;
diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index dc75d37a86..0d9cd2f825 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -286,7 +286,7 @@ public:
Heap::Object *newObject();
Heap::Object *newObject(InternalClass *internalClass, Object *prototype);
- Heap::String *newString(const QString &s);
+ Heap::String *newString(const QString &s = QString());
Heap::String *newIdentifier(const QString &text);
Heap::Object *newStringObject(const ValueRef value);
diff --git a/src/qml/jsruntime/qv4errorobject.cpp b/src/qml/jsruntime/qv4errorobject.cpp
index d08619f881..b1c83a075a 100644
--- a/src/qml/jsruntime/qv4errorobject.cpp
+++ b/src/qml/jsruntime/qv4errorobject.cpp
@@ -356,7 +356,7 @@ void ErrorPrototype::init(ExecutionEngine *engine, Object *ctor, Object *obj)
ctor->defineReadonlyProperty(engine->id_length, Primitive::fromInt32(1));
obj->defineDefaultProperty(QStringLiteral("constructor"), (o = ctor));
obj->defineDefaultProperty(engine->id_toString, method_toString, 0);
- obj->defineDefaultProperty(QStringLiteral("message"), (s = engine->newString(QString())));
+ obj->defineDefaultProperty(QStringLiteral("message"), (s = engine->newString()));
}
ReturnedValue ErrorPrototype::method_toString(CallContext *ctx)
diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp
index 7191a16235..ff78cf3e13 100644
--- a/src/qml/jsruntime/qv4regexpobject.cpp
+++ b/src/qml/jsruntime/qv4regexpobject.cpp
@@ -447,7 +447,7 @@ ReturnedValue RegExpPrototype::method_get_lastMatch_n(CallContext *ctx)
ScopedArrayObject lastMatch(scope, static_cast<RegExpCtor*>(ctx->d()->engine->regExpCtor.objectValue())->lastMatch());
ScopedValue result(scope, lastMatch ? lastMatch->getIndexed(index) : Encode::undefined());
if (result->isUndefined())
- return ctx->d()->engine->newString(QString())->asReturnedValue();
+ return ctx->d()->engine->newString()->asReturnedValue();
return result.asReturnedValue();
}
@@ -457,7 +457,7 @@ ReturnedValue RegExpPrototype::method_get_lastParen(CallContext *ctx)
ScopedArrayObject lastMatch(scope, static_cast<RegExpCtor*>(ctx->d()->engine->regExpCtor.objectValue())->lastMatch());
ScopedValue result(scope, lastMatch ? lastMatch->getIndexed(lastMatch->getLength() - 1) : Encode::undefined());
if (result->isUndefined())
- return ctx->d()->engine->newString(QString())->asReturnedValue();
+ return ctx->d()->engine->newString()->asReturnedValue();
return result.asReturnedValue();
}
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp
index 8c864803af..cb35c78204 100644
--- a/src/qml/jsruntime/qv4stringobject.cpp
+++ b/src/qml/jsruntime/qv4stringobject.cpp
@@ -74,7 +74,7 @@ Heap::StringObject::StringObject(InternalClass *ic, QV4::Object *prototype)
: Heap::Object(ic, prototype)
{
Q_ASSERT(internalClass->vtable == QV4::StringObject::staticVTable());
- value = ic->engine->newString(QStringLiteral(""))->asReturnedValue();
+ value = ic->engine->newString()->asReturnedValue();
tmpProperty.value = Primitive::undefinedValue();
Scope scope(ic->engine);
@@ -174,7 +174,7 @@ ReturnedValue StringCtor::construct(Managed *m, CallData *callData)
if (callData->argc)
value = callData->args[0].toString(v4);
else
- value = v4->newString(QString());
+ value = v4->newString();
return Encode(v4->newStringObject(value));
}
@@ -186,7 +186,7 @@ ReturnedValue StringCtor::call(Managed *m, CallData *callData)
if (callData->argc)
value = callData->args[0].toString(v4);
else
- value = v4->newString(QString());
+ value = v4->newString();
return value.asReturnedValue();
}
@@ -674,7 +674,7 @@ ReturnedValue StringPrototype::method_split(CallContext *ctx)
if (re) {
if (re->value()->pattern.isEmpty()) {
re = (RegExpObject *)0;
- separatorValue = ctx->d()->engine->newString(QString());
+ separatorValue = ctx->d()->engine->newString();
}
}