Continue conversion to using scoped values

This converts all methods in qv4runtime_p.h to not
use raw values in arguments anymore.

The conversion of return values will be done in a separate
commit.

Change-Id: Ie6e8f3bed459d09cb831f7f87920b7eada161502
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 11 insertions, 9 deletions

diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp
index 5d9abfe74e..1ef4aec246 100644
--- a/src/qml/jsruntime/qv4dateobject.cpp
+++ b/src/qml/jsruntime/qv4dateobject.cpp
@@ -662,16 +662,17 @@ Value DateCtor::construct(Managed *m, CallData *callData)
         t = currentTime();
 
     else if (callData->argc == 1) {
-        Value arg = callData->args[0];
-        if (DateObject *d = arg.asDateObject())
+        ValueScope scope(m->engine());
+        ScopedValue arg(scope, callData->args[0]);
+        if (DateObject *d = arg->asDateObject())
             arg = d->value;
         else
             arg = __qmljs_to_primitive(arg, PREFERREDTYPE_HINT);
 
-        if (arg.isString())
-            t = ParseString(arg.stringValue()->toQString());
+        if (arg->isString())
+            t = ParseString(arg->stringValue()->toQString());
         else
-            t = TimeClip(arg.toNumber());
+            t = TimeClip(arg->toNumber());
     }
 
     else { // d.argc > 1
@@ -1290,13 +1291,14 @@ Value DatePrototype::method_toISOString(SimpleCallContext *ctx)
 
 Value DatePrototype::method_toJSON(SimpleCallContext *ctx)
 {
-    Value O = __qmljs_to_object(ctx, ctx->thisObject);
-    Value tv = __qmljs_to_primitive(O, NUMBER_HINT);
+    ValueScope scope(ctx);
+    ScopedValue O(scope, __qmljs_to_object(ctx, ValueRef(&ctx->thisObject)));
+    ScopedValue tv(scope, __qmljs_to_primitive(O, NUMBER_HINT));
 
-    if (tv.isNumber() && !std::isfinite(tv.toNumber()))
+    if (tv->isNumber() && !std::isfinite(tv->toNumber()))
         return Value::nullValue();
 
-    FunctionObject *toIso = O.objectValue()->get(ctx->engine->newString(QStringLiteral("toISOString"))).asFunctionObject();
+    FunctionObject *toIso = O->objectValue()->get(ctx->engine->newString(QStringLiteral("toISOString"))).asFunctionObject();
 
     if (!toIso)
         ctx->throwTypeError();