Convert more methods to use ReturnedValue

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

Change-Id: I53ce17e5656e260138b1ac7f6d467e4636c0a0b9
Reviewed-by: Simon Hausmann <[email protected]>

1 files changed, 5 insertions, 3 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);
 }
 
 /*!