Correctly catch exceptions in the API methods

Replace all C++ try/catch statements with
engine->hasException checks.

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

1 files changed, 11 insertions, 12 deletions

diff --git a/src/qml/jsapi/qjsvalueiterator.cpp b/src/qml/jsapi/qjsvalueiterator.cpp
index dcf7c4755b..245b75b384 100644
--- a/src/qml/jsapi/qjsvalueiterator.cpp
+++ b/src/qml/jsapi/qjsvalueiterator.cpp
@@ -199,21 +199,20 @@ QJSValue QJSValueIterator::value() const
     QV4::ScopedObject o(scope, it->it.object);
 
     QV4::ExecutionContext *ctx = engine->current;
-    try {
-        QV4::ScopedValue v(scope);
-        if (!!d_ptr->currentName) {
-            QV4::ScopedString n(scope, d_ptr->currentName);
-            v = o->get(n);
-        } else if (d_ptr->currentIndex != UINT_MAX) {
-            v = o->getIndexed(d_ptr->currentIndex);
-        } else {
-            return QJSValue();
-        }
-        return new QJSValuePrivate(engine, v);
-    } catch (...) {
+    QV4::ScopedValue v(scope);
+    if (!!d_ptr->currentName) {
+        QV4::ScopedString n(scope, d_ptr->currentName);
+        v = o->get(n);
+    } else if (d_ptr->currentIndex != UINT_MAX) {
+        v = o->getIndexed(d_ptr->currentIndex);
+    } else {
+        return QJSValue();
+    }
+    if (scope.hasException()) {
         ctx->catchException();
         return QJSValue();
     }
+    return new QJSValuePrivate(engine, v);
 }