Convert more methods to use ReturnedValue

Change Exception.value() and a few other places.

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

2 files changed, 13 insertions, 9 deletions

diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp
index d3c2c75ca7..7bc8b80396 100644
--- a/src/qml/jsapi/qjsengine.cpp
+++ b/src/qml/jsapi/qjsengine.cpp
@@ -260,18 +260,20 @@ void QJSEngine::collectGarbage()
 */
 QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, int lineNumber)
 {
+    QV4::Scope scope(d->m_v4Engine);
     QV4::ExecutionContext *ctx = d->m_v4Engine->current;
+    QV4::ScopedValue result(scope);
     try {
         QV4::Script script(ctx, program, fileName, lineNumber);
         script.strictMode = ctx->strictMode;
         script.inheritContext = true;
         script.parse();
-        QV4::Value result = script.run();
-        return new QJSValuePrivate(d->m_v4Engine, result);
+        result = script.run();
     } catch (QV4::Exception& ex) {
         ex.accept(ctx);
-        return new QJSValuePrivate(d->m_v4Engine, ex.value());
+        result = ex.value();
     }
+    return new QJSValuePrivate(d->m_v4Engine, result);
 }
 
 /*!
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp
index dabb9f5b29..e596cb6303 100644
--- a/src/qml/jsapi/qjsvalue.cpp
+++ b/src/qml/jsapi/qjsvalue.cpp
@@ -807,13 +807,14 @@ QJSValue QJSValue::property(const QString& name) const
 
     s->makeIdentifier();
     QV4::ExecutionContext *ctx = engine->current;
+    QV4::ScopedValue result(scope);
     try {
-        QV4::ScopedValue v(scope, o->get(s));
-        return new QJSValuePrivate(engine, v);
+        result = o->get(s);
     } catch (QV4::Exception &e) {
         e.accept(ctx);
-        return new QJSValuePrivate(engine, e.value());
+        result = e.value();
     }
+    return new QJSValuePrivate(engine, result);
 }
 
 /*!
@@ -840,13 +841,14 @@ QJSValue QJSValue::property(quint32 arrayIndex) const
         return QJSValue();
 
     QV4::ExecutionContext *ctx = engine->current;
+    QV4::ScopedValue result(scope);
     try {
-        QV4::ScopedValue v(scope, arrayIndex == UINT_MAX ? o->get(engine->id_uintMax) : o->getIndexed(arrayIndex));
-        return new QJSValuePrivate(engine, v);
+        result = arrayIndex == UINT_MAX ? o->get(engine->id_uintMax) : o->getIndexed(arrayIndex);
     } catch (QV4::Exception &e) {
         e.accept(ctx);
-        return new QJSValuePrivate(engine, e.value());
+        result = e.value();
     }
+    return new QJSValuePrivate(engine, result);
 }
 
 /*!