From 16f92ad85cf665d863ded5eeaaa7fc3f90820b3f Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 12 Sep 2013 11:13:03 +0200 Subject: Convert builtin methods to return a ReturnedValue Change-Id: I6b75adbf53a5be0deab023d2eed98ce2a7915551 Reviewed-by: Simon Hausmann --- src/qml/qml/qqmlvaluetypewrapper.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/qml/qml/qqmlvaluetypewrapper.cpp') diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp index 98b2497b0d..d9ee928858 100644 --- a/src/qml/qml/qqmlvaluetypewrapper.cpp +++ b/src/qml/qml/qqmlvaluetypewrapper.cpp @@ -239,7 +239,7 @@ bool QmlValueTypeWrapper::isEqual(const QVariant& value) } } -Value QmlValueTypeWrapper::method_toString(SimpleCallContext *ctx) +ReturnedValue QmlValueTypeWrapper::method_toString(SimpleCallContext *ctx) { Object *o = ctx->thisObject.asObject(); if (!o) @@ -251,15 +251,15 @@ Value QmlValueTypeWrapper::method_toString(SimpleCallContext *ctx) if (w->objectType == QmlValueTypeWrapper::Reference) { QmlValueTypeReference *reference = static_cast(w); if (reference->object && readReferenceValue(reference)) { - return w->v8->toString(w->type->toString()); + return w->v8->toString(w->type->toString()).asReturnedValue(); } else { - return QV4::Value::undefinedValue(); + return QV4::Encode::undefined(); } } else { Q_ASSERT(w->objectType == QmlValueTypeWrapper::Copy); QmlValueTypeCopy *copy = static_cast(w); w->type->setValue(copy->value); - return w->v8->toString(w->type->toString()); + return w->v8->toString(w->type->toString()).asReturnedValue(); } } -- cgit v1.2.3