Fix the remaining try/catch statements in C++

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

1 files changed, 9 insertions, 11 deletions

diff --git a/src/qml/jsruntime/qv4value.cpp b/src/qml/jsruntime/qv4value.cpp
index ebd1894016..a7413e031c 100644
--- a/src/qml/jsruntime/qv4value.cpp
+++ b/src/qml/jsruntime/qv4value.cpp
@@ -125,22 +125,20 @@ QString Value::toQStringNoThrow() const
             Scope scope(ctx);
             ScopedValue ex(scope);
             bool caughtException = false;
-            try {
-                ScopedValue prim(scope, __qmljs_to_primitive(ValueRef::fromRawValue(this), STRING_HINT));
-                if (prim->isPrimitive())
-                    return prim->toQStringNoThrow();
-            } catch (...) {
+            ScopedValue prim(scope, __qmljs_to_primitive(ValueRef::fromRawValue(this), STRING_HINT));
+            if (scope.hasException()) {
                 ex = ctx->catchException();
                 caughtException = true;
+            } else if (prim->isPrimitive()) {
+                    return prim->toQStringNoThrow();
             }
             // Can't nest try/catch due to CXX ABI limitations for foreign exception nesting.
             if (caughtException) {
-                try {
-                    ScopedValue prim(scope, __qmljs_to_primitive(ex, STRING_HINT));
-                    if (prim->isPrimitive())
-                        return prim->toQStringNoThrow();
-                } catch(...) {
-                    ctx->catchException();
+                ScopedValue prim(scope, __qmljs_to_primitive(ex, STRING_HINT));
+                if (scope.hasException()) {
+                    ex = ctx->catchException();
+                } else if (prim->isPrimitive()) {
+                    return prim->toQStringNoThrow();
                 }
             }
             return QString();