remove more uses of QV4::Value

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

5 files changed, 49 insertions, 50 deletions

diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 826feeb331..42b74f879e 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -663,7 +663,7 @@ void QQuickCanvasItem::updatePolish()
         QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(qmlEngine(this));
         QV4::Scope scope(v4);
         QV4::ScopedCallData callData(scope, 1);
-        callData->thisObject = QV4::Value::fromReturnedValue(QV4::QObjectWrapper::wrap(v4, this));
+        callData->thisObject = QV4::QObjectWrapper::wrap(v4, this);
 
         foreach (int key, animationCallbacks.keys()) {
             QV4::ScopedFunctionObject f(scope, animationCallbacks.value(key).value());
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index 7be8d0927a..422a827acb 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -127,9 +127,9 @@ static const double Q_PI   = 3.14159265358979323846;   // pi
                                        V4THROW_ERROR("Not a Context2D object");
 #define qClamp(val, min, max) qMin(qMax(val, min), max)
 #define CHECK_RGBA(c) (c == '-' || c == '.' || (c >=0 && c <= 9))
-QColor qt_color_from_string(const QV4::Value &name)
+QColor qt_color_from_string(const QV4::ValueRef name)
 {
-    QByteArray str = name.toQStringNoThrow().toUtf8();
+    QByteArray str = name->toQString().toUtf8();
 
     char *p = str.data();
     int len = str.length();
@@ -911,7 +911,7 @@ struct QQuickJSContext2DImageData : public QV4::Object
 
 DEFINE_MANAGED_VTABLE(QQuickJSContext2DImageData);
 
-static QV4::Value qt_create_image_data(qreal w, qreal h, QV8Engine* engine, const QImage& image)
+static QV4::ReturnedValue qt_create_image_data(qreal w, qreal h, QV8Engine* engine, const QImage& image)
 {
     QQuickContext2DEngineData *ed = engineData(engine);
     QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine);
@@ -928,9 +928,9 @@ static QV4::Value qt_create_image_data(qreal w, qreal h, QV8Engine* engine, cons
         pixelData->image = image.format() == QImage::Format_ARGB32 ? image : image.convertToFormat(QImage::Format_ARGB32);
     }
 
-    QQuickJSContext2DImageData *imageData = new (v4->memoryManager) QQuickJSContext2DImageData(v4);
+    QV4::Scoped<QQuickJSContext2DImageData> imageData(scope, new (v4->memoryManager) QQuickJSContext2DImageData(v4));
     imageData->pixelData = pixelData.asValue();
-    return QV4::Value::fromObject(imageData);
+    return imageData.asReturnedValue();
 }
 
 //static script functions
@@ -3244,11 +3244,11 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createImageData(QV4::Simpl
             if (pa) {
                 qreal w = pa->image.width();
                 qreal h = pa->image.height();
-                return qt_create_image_data(w, h, engine, QImage()).asReturnedValue();
+                return qt_create_image_data(w, h, engine, QImage());
             }
         } else if (arg0->isString()) {
             QImage image = r->context->createPixmap(QUrl(arg0->toQStringNoThrow()))->image();
-            return qt_create_image_data(image.width(), image.height(), engine, image).asReturnedValue();
+            return qt_create_image_data(image.width(), image.height(), engine, image);
         }
     } else if (ctx->callData->argc == 2) {
         qreal w = ctx->callData->args[0].toNumber();
@@ -3258,7 +3258,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_createImageData(QV4::Simpl
             V4THROW_DOM(DOMEXCEPTION_NOT_SUPPORTED_ERR, "createImageData(): invalid arguments");
 
         if (w > 0 && h > 0)
-            return qt_create_image_data(w, h, engine, QImage()).asReturnedValue();
+            return qt_create_image_data(w, h, engine, QImage());
         else
             V4THROW_DOM(DOMEXCEPTION_INDEX_SIZE_ERR, "createImageData(): invalid arguments");
     }
@@ -3288,9 +3288,7 @@ QV4::ReturnedValue QQuickJSContext2DPrototype::method_getImageData(QV4::SimpleCa
             V4THROW_DOM(DOMEXCEPTION_INDEX_SIZE_ERR, "getImageData(): Invalid arguments");
 
         QImage image = r->context->canvas()->toImage(QRectF(x, y, w, h));
-        QV4::Value imageData = qt_create_image_data(w, h, engine, image);
-
-        return imageData.asReturnedValue();
+        return qt_create_image_data(w, h, engine, image);
     }
     return QV4::Encode::null();
 }
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index a59c308354..48b934e1e1 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -569,13 +569,14 @@ void QQuickLoader::setSource(QQmlV4Function *args)
 
     bool ipvError = false;
     args->setReturnValue(QV4::Encode::undefined());
-    QV4::Value ipv = d->extractInitialPropertyValues(args, this, &ipvError);
+    QV4::Scope scope(args->v4engine());
+    QV4::ScopedValue ipv(scope, d->extractInitialPropertyValues(args, this, &ipvError));
     if (ipvError)
         return;
 
     d->clear();
     QUrl sourceUrl = d->resolveSourceUrl(args);
-    if (!ipv.isUndefined()) {
+    if (!ipv->isUndefined()) {
         d->disposeInitialPropertyValues();
         d->initialPropertyValues = ipv.asReturnedValue();
         d->qmlGlobalForIpv = args->qmlGlobal();
@@ -937,7 +938,7 @@ QUrl QQuickLoaderPrivate::resolveSourceUrl(QQmlV4Function *args)
     return context->resolvedUrl(QUrl(arg));
 }
 
-QV4::Value QQuickLoaderPrivate::extractInitialPropertyValues(QQmlV4Function *args, QObject *loader, bool *error)
+QV4::ReturnedValue QQuickLoaderPrivate::extractInitialPropertyValues(QQmlV4Function *args, QObject *loader, bool *error)
 {
     QV4::Scope scope(args->v4engine());
     QV4::ScopedValue valuemap(scope, QV4::Primitive::undefinedValue());
@@ -952,7 +953,7 @@ QV4::Value QQuickLoaderPrivate::extractInitialPropertyValues(QQmlV4Function *arg
         }
     }
 
-    return valuemap;
+    return valuemap.asReturnedValue();
 }
 
 #include <moc_qquickloader_p.cpp>
diff --git a/src/quick/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h
index a24bfb892a..825cfc1bd8 100644
--- a/src/quick/items/qquickloader_p_p.h
+++ b/src/quick/items/qquickloader_p_p.h
@@ -97,7 +97,7 @@ public:
     void setInitialState(QObject *o);
     void disposeInitialPropertyValues();
     QUrl resolveSourceUrl(QQmlV4Function *args);
-    QV4::Value extractInitialPropertyValues(QQmlV4Function *args, QObject *loader, bool *error);
+    QV4::ReturnedValue extractInitialPropertyValues(QQmlV4Function *args, QObject *loader, bool *error);
 
     virtual qreal getImplicitWidth() const;
     virtual qreal getImplicitHeight() const;
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index ea0b85c9ff..561162aba4 100644
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -328,61 +328,61 @@ public:
 
         QV4::ScopedString s(scope);
 
-        QV4::Value vbold = QV4::Value::fromReturnedValue(obj->get((s = v4->newString(QStringLiteral("bold")))));
-        QV4::Value vcap = QV4::Value::fromReturnedValue(obj->get((s = v4->newString(QStringLiteral("capitalization")))));
-        QV4::Value vfam = QV4::Value::fromReturnedValue(obj->get((s = v4->newString(QStringLiteral("family")))));
-        QV4::Value vital = QV4::Value::fromReturnedValue(obj->get((s = v4->newString(QStringLiteral("italic")))));
-        QV4::Value vlspac = QV4::Value::fromReturnedValue(obj->get((s = v4->newString(QStringLiteral("letterSpacing")))));
-        QV4::Value vpixsz = QV4::Value::fromReturnedValue(obj->get((s = v4->newString(QStringLiteral("pixelSize")))));
-        QV4::Value vpntsz = QV4::Value::fromReturnedValue(obj->get((s = v4->newString(QStringLiteral("pointSize")))));
-        QV4::Value vstrk = QV4::Value::fromReturnedValue(obj->get((s = v4->newString(QStringLiteral("strikeout")))));
-        QV4::Value vundl = QV4::Value::fromReturnedValue(obj->get((s = v4->newString(QStringLiteral("underline")))));
-        QV4::Value vweight = QV4::Value::fromReturnedValue(obj->get((s = v4->newString(QStringLiteral("weight")))));
-        QV4::Value vwspac = QV4::Value::fromReturnedValue(obj->get((s = v4->newString(QStringLiteral("wordSpacing")))));
+        QV4::ScopedValue vbold(scope, obj->get((s = v4->newString(QStringLiteral("bold")))));
+        QV4::ScopedValue vcap(scope, obj->get((s = v4->newString(QStringLiteral("capitalization")))));
+        QV4::ScopedValue vfam(scope, obj->get((s = v4->newString(QStringLiteral("family")))));
+        QV4::ScopedValue vital(scope, obj->get((s = v4->newString(QStringLiteral("italic")))));
+        QV4::ScopedValue vlspac(scope, obj->get((s = v4->newString(QStringLiteral("letterSpacing")))));
+        QV4::ScopedValue vpixsz(scope, obj->get((s = v4->newString(QStringLiteral("pixelSize")))));
+        QV4::ScopedValue vpntsz(scope, obj->get((s = v4->newString(QStringLiteral("pointSize")))));
+        QV4::ScopedValue vstrk(scope, obj->get((s = v4->newString(QStringLiteral("strikeout")))));
+        QV4::ScopedValue vundl(scope, obj->get((s = v4->newString(QStringLiteral("underline")))));
+        QV4::ScopedValue vweight(scope, obj->get((s = v4->newString(QStringLiteral("weight")))));
+        QV4::ScopedValue vwspac(scope, obj->get((s = v4->newString(QStringLiteral("wordSpacing")))));
 
         // pull out the values, set ok to true if at least one valid field is given.
-        if (vbold.isBoolean()) {
-            retn.setBold(vbold.booleanValue());
+        if (vbold->isBoolean()) {
+            retn.setBold(vbold->booleanValue());
             if (ok) *ok = true;
         }
-        if (vcap.isInt32()) {
-            retn.setCapitalization(static_cast<QFont::Capitalization>(vcap.integerValue()));
+        if (vcap->isInt32()) {
+            retn.setCapitalization(static_cast<QFont::Capitalization>(vcap->integerValue()));
             if (ok) *ok = true;
         }
-        if (vfam.isString()) {
-            retn.setFamily(vfam.toQStringNoThrow());
+        if (vfam->isString()) {
+            retn.setFamily(vfam->toQString());
             if (ok) *ok = true;
         }
-        if (vital.isBoolean()) {
-            retn.setItalic(vital.booleanValue());
+        if (vital->isBoolean()) {
+            retn.setItalic(vital->booleanValue());
             if (ok) *ok = true;
         }
-        if (vlspac.isNumber()) {
-            retn.setLetterSpacing(QFont::AbsoluteSpacing, vlspac.asDouble());
+        if (vlspac->isNumber()) {
+            retn.setLetterSpacing(QFont::AbsoluteSpacing, vlspac->asDouble());
             if (ok) *ok = true;
         }
-        if (vpixsz.isInt32()) {
-            retn.setPixelSize(vpixsz.integerValue());
+        if (vpixsz->isInt32()) {
+            retn.setPixelSize(vpixsz->integerValue());
             if (ok) *ok = true;
         }
-        if (vpntsz.isNumber()) {
-            retn.setPointSize(vpntsz.asDouble());
+        if (vpntsz->isNumber()) {
+            retn.setPointSize(vpntsz->asDouble());
             if (ok) *ok = true;
         }
-        if (vstrk.isBoolean()) {
-            retn.setStrikeOut(vstrk.booleanValue());
+        if (vstrk->isBoolean()) {
+            retn.setStrikeOut(vstrk->booleanValue());
             if (ok) *ok = true;
         }
-        if (vundl.isBoolean()) {
-            retn.setUnderline(vundl.booleanValue());
+        if (vundl->isBoolean()) {
+            retn.setUnderline(vundl->booleanValue());
             if (ok) *ok = true;
         }
-        if (vweight.isInt32()) {
-            retn.setWeight(static_cast<QFont::Weight>(vweight.integerValue()));
+        if (vweight->isInt32()) {
+            retn.setWeight(static_cast<QFont::Weight>(vweight->integerValue()));
             if (ok) *ok = true;
         }
-        if (vwspac.isNumber()) {
-            retn.setWordSpacing(vwspac.asDouble());
+        if (vwspac->isNumber()) {
+            retn.setWordSpacing(vwspac->asDouble());
             if (ok) *ok = true;
         }