diff options
author | Lars Knoll <[email protected]> | 2013-09-26 12:04:52 +0200 |
---|---|---|
committer | The Qt Project <[email protected]> | 2013-09-28 13:33:46 +0200 |
commit | d2e2a5b59c617e6cf7236cf36e9c20fe9ea36fdb (patch) | |
tree | 1fc21beff4add85e68a61b7c88b5d5f928bec6e8 /src/qml/jsruntime/qv4jsonobject.cpp | |
parent | 18d4794e3f614eec8594f6636d569af8bc112618 (diff) |
Remove Value::fromString()
replaced with call to the GC safe ExceutionEngine::newString()
method.
Change-Id: I7258296e75ca724ff42b94a0d147bc33a05f8f68
Reviewed-by: Simon Hausmann <[email protected]>
Diffstat (limited to 'src/qml/jsruntime/qv4jsonobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4jsonobject.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp index b6429278c2..53bdb6d630 100644 --- a/src/qml/jsruntime/qv4jsonobject.cpp +++ b/src/qml/jsruntime/qv4jsonobject.cpp @@ -400,7 +400,7 @@ bool JsonParser::parseValue(ValueRef val) return false; DEBUG << "value: string"; END; - *val = Value::fromString(context, value); + val = context->engine->newString(value); return true; } case BeginArray: { @@ -709,7 +709,7 @@ QString Stringify::Str(const QString &key, Value value) if (!!toJSON) { ScopedCallData callData(scope, 1); callData->thisObject = value; - callData->args[0] = Value::fromString(ctx, key); + callData->args[0] = ctx->engine->newString(key); value = Value::fromReturnedValue(toJSON->call(callData)); } } @@ -719,7 +719,7 @@ QString Stringify::Str(const QString &key, Value value) ScopedValue v(scope, value); holder->put(ctx, QString(), v); ScopedCallData callData(scope, 2); - callData->args[0] = Value::fromString(ctx, key); + callData->args[0] = ctx->engine->newString(key); callData->args[1] = value; callData->thisObject = holder; value = Value::fromReturnedValue(replacerFunction->call(callData)); @@ -940,7 +940,7 @@ ReturnedValue JsonObject::method_stringify(SimpleCallContext *ctx) QString result = stringify.Str(QString(), arg0); if (result.isEmpty()) return Encode::undefined(); - return Value::fromString(ctx, result).asReturnedValue(); + return ctx->engine->newString(result)->asReturnedValue(); } @@ -948,7 +948,7 @@ ReturnedValue JsonObject::method_stringify(SimpleCallContext *ctx) ReturnedValue JsonObject::fromJsonValue(ExecutionEngine *engine, const QJsonValue &value) { if (value.isString()) - return Value::fromString(engine->current, value.toString()).asReturnedValue(); + return engine->current->engine->newString(value.toString())->asReturnedValue(); else if (value.isDouble()) return Encode(value.toDouble()); else if (value.isBool()) |