Fix API for Object::define*Property

use ValueRef instead of const Value &.

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

4 files changed, 8 insertions, 8 deletions

diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 638ff942ab..926b5c34d8 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -1569,7 +1569,8 @@ QV4::ReturnedValue ConsoleObject::method_exception(SimpleCallContext *ctx)
 
 void QV4::GlobalExtensions::init(QQmlEngine *qmlEngine, Object *globalObject)
 {
-    QV4::ExecutionEngine *v4 = globalObject->engine();
+    ExecutionEngine *v4 = globalObject->engine();
+    Scope scope(v4);
 
 #ifndef QT_NO_TRANSLATION
     globalObject->defineDefaultProperty(QStringLiteral("qsTranslate"), method_qsTranslate);
@@ -1583,15 +1584,14 @@ void QV4::GlobalExtensions::init(QQmlEngine *qmlEngine, Object *globalObject)
     globalObject->defineDefaultProperty(QStringLiteral("print"), ConsoleObject::method_log);
     globalObject->defineDefaultProperty(QStringLiteral("gc"), method_gc);
 
-    Value console = QV4::Value::fromObject(new (v4->memoryManager) QV4::ConsoleObject(v4));
+    ScopedValue console(scope, new (v4->memoryManager) QV4::ConsoleObject(v4));
     globalObject->defineDefaultProperty(QStringLiteral("console"), console);
 
-    Value qt = QV4::Value::fromObject(new (v4->memoryManager) QV4::QtObject(v4, qmlEngine));
+    ScopedValue qt(scope, new (v4->memoryManager) QV4::QtObject(v4, qmlEngine));
     globalObject->defineDefaultProperty(QStringLiteral("Qt"), qt);
 
     // string prototype extension
-    QV4::Object *stringProto = v4->stringClass->prototype;
-    stringProto->defineDefaultProperty(QStringLiteral("arg"), method_string_arg);
+    v4->stringClass->prototype->defineDefaultProperty(QStringLiteral("arg"), method_string_arg);
 }
 
 
diff --git a/src/qml/qml/v8/qv4domerrors.cpp b/src/qml/qml/v8/qv4domerrors.cpp
index 60b76d087c..03a763c553 100644
--- a/src/qml/qml/v8/qv4domerrors.cpp
+++ b/src/qml/qml/v8/qv4domerrors.cpp
@@ -67,7 +67,7 @@ void qt_add_domexceptions(ExecutionEngine *e)
     domexception->defineReadonlyProperty(QStringLiteral("INVALID_ACCESS_ERR"), Primitive::fromInt32(DOMEXCEPTION_INVALID_ACCESS_ERR));
     domexception->defineReadonlyProperty(QStringLiteral("VALIDATION_ERR"), Primitive::fromInt32(DOMEXCEPTION_VALIDATION_ERR));
     domexception->defineReadonlyProperty(QStringLiteral("TYPE_MISMATCH_ERR"), Primitive::fromInt32(DOMEXCEPTION_TYPE_MISMATCH_ERR));
-    e->globalObject->defineDefaultProperty(QStringLiteral("DOMException"), domexception.asValue());
+    e->globalObject->defineDefaultProperty(QStringLiteral("DOMException"), domexception);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qml/qml/v8/qv4sqlerrors.cpp b/src/qml/qml/v8/qv4sqlerrors.cpp
index 20fec3b26d..222d676700 100644
--- a/src/qml/qml/v8/qv4sqlerrors.cpp
+++ b/src/qml/qml/v8/qv4sqlerrors.cpp
@@ -59,7 +59,7 @@ void qt_add_sqlexceptions(QV4::ExecutionEngine *engine)
     sqlexception->defineReadonlyProperty(QStringLiteral("SYNTAX_ERR"), Primitive::fromInt32(SQLEXCEPTION_SYNTAX_ERR));
     sqlexception->defineReadonlyProperty(QStringLiteral("CONSTRAINT_ERR"), Primitive::fromInt32(SQLEXCEPTION_CONSTRAINT_ERR));
     sqlexception->defineReadonlyProperty(QStringLiteral("TIMEOUT_ERR"), Primitive::fromInt32(SQLEXCEPTION_TIMEOUT_ERR));
-    engine->globalObject->defineDefaultProperty(QStringLiteral("SQLException"), sqlexception.asValue());
+    engine->globalObject->defineDefaultProperty(QStringLiteral("SQLException"), sqlexception);
 }
 
 QT_END_NAMESPACE
diff --git a/src/qml/qml/v8/qv8engine_p.h b/src/qml/qml/v8/qv8engine_p.h
index 7d3686f76d..a92d03ac50 100644
--- a/src/qml/qml/v8/qv8engine_p.h
+++ b/src/qml/qml/v8/qv8engine_p.h
@@ -126,7 +126,7 @@ class QQmlV4Function
 {
 public:
     int length() const { return callData->argc; }
-    QV4::ReturnedValue operator[](int idx) { return (idx < callData->argc ? callData->args[idx] : QV4::Primitive::undefinedValue()).asReturnedValue(); }
+    QV4::ReturnedValue operator[](int idx) { return (idx < callData->argc ? callData->args[idx].asReturnedValue() : QV4::Encode::undefined()); }
     QQmlContextData *context() { return ctx; }
     QV4::ReturnedValue qmlGlobal() { return callData->thisObject.asReturnedValue(); }
     void setReturnValue(QV4::ReturnedValue rv) { retVal = rv; }