Unify QScriptValue::toObject() and QScriptEngine::toObject()

QScriptValue::toObject() call QScriptEngine::toObject() so the code is
not duplicated.

Reviewed-by: Kent Hansen

1 files changed, 1 insertions, 19 deletions

diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index 048d427..24ff050 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -1600,25 +1600,7 @@ QScriptValue QScriptValue::toObject() const
     Q_D(const QScriptValue);
     if (!d || !d->engine)
         return QScriptValue();
-    switch (d->type) {
-    case QScriptValuePrivate::JSC: {
-        if (JSC::JSImmediate::isUndefinedOrNull(d->jscValue))
-            return QScriptValue();
-        QScriptEnginePrivate *eng_p = QScriptEnginePrivate::get(d->engine);
-        Q_ASSERT(eng_p != 0);
-        JSC::ExecState *exec = eng_p->currentFrame;
-        JSC::JSValue savedException;
-        QScriptValuePrivate::saveException(exec, &savedException);
-        JSC::JSObject *result = d->jscValue.toObject(exec);
-        QScriptValuePrivate::restoreException(exec, savedException);
-        return eng_p->scriptValueFromJSCValue(result);
-    }
-    case QScriptValuePrivate::Number:
-    case QScriptValuePrivate::String:
-        Q_ASSERT_X(false, Q_FUNC_INFO, "you should not get here");
-        break;
-    }
-    return QScriptValue();
+    return engine()->toObject(*this);
 }
 
 /*!