From 2c7c791e3f0d801a8c1051b7da7b53cb4e50a017 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 7 May 2014 15:36:38 +0200 Subject: Remove the less often used Ref classes Change-Id: I9ee531c903317a0f324671d98af1f967b684915c Reviewed-by: Simon Hausmann --- src/qml/qml/qqmlvmemetaobject.cpp | 2 +- src/qml/qml/v8/qv8engine.cpp | 3 +-- src/qml/qml/v8/qv8engine_p.h | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/qml/qml') diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index 1ff95a245d..2f04984264 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -1087,7 +1087,7 @@ void QQmlVMEMetaObject::writeProperty(int id, const QVariant &value) // And, if the new value is a scarce resource, we need to ensure that it does not get // automatically released by the engine until no other references to it exist. QV4::ScopedValue newv(scope, QQmlEnginePrivate::get(ctxt->engine)->v8engine()->fromVariant(value)); - QV4::VariantObjectRef v = newv; + QV4::Scoped v(scope, newv); if (!!v) v->addVmePropertyReference(); diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp index 5dcbae66fe..a8a4f6a29e 100644 --- a/src/qml/qml/v8/qv8engine.cpp +++ b/src/qml/qml/v8/qv8engine.cpp @@ -560,8 +560,7 @@ QV4::ReturnedValue QV8Engine::variantListToJS(const QVariantList &lst) // The result is a QVariantList with length equal to the length // of the JS Array, and elements being the JS Array's elements // converted to QVariants, recursively. -QVariantList QV8Engine::variantListFromJS(QV4::ArrayObjectRef a, - V8ObjectSet &visitedObjects) +QVariantList QV8Engine::variantListFromJS(QV4::ArrayObject *a, V8ObjectSet &visitedObjects) { QVariantList result; if (!a) diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h index 1295e671f0..dfdce4556a 100644 --- a/src/qml/qml/v8/qv8engine_p.h +++ b/src/qml/qml/v8/qv8engine_p.h @@ -228,7 +228,7 @@ public: void setExtensionData(int, Deletable *); QV4::ReturnedValue variantListToJS(const QVariantList &lst); - inline QVariantList variantListFromJS(QV4::ArrayObjectRef array) + inline QVariantList variantListFromJS(QV4::ArrayObject *array) { V8ObjectSet visitedObjects; return variantListFromJS(array, visitedObjects); } QV4::ReturnedValue variantMapToJS(const QVariantMap &vmap); @@ -280,7 +280,7 @@ protected: void initializeGlobal(); private: - QVariantList variantListFromJS(QV4::ArrayObjectRef array, V8ObjectSet &visitedObjects); + QVariantList variantListFromJS(QV4::ArrayObject *array, V8ObjectSet &visitedObjects); QVariantMap variantMapFromJS(QV4::ObjectRef object, V8ObjectSet &visitedObjects); QVariant variantFromJS(const QV4::ValueRef value, V8ObjectSet &visitedObjects); -- cgit v1.2.3