diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-01-15 21:28:01 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2015-01-23 12:30:35 +0100 |
| commit | 3dbf4e9a6979802fff55e2f5e6aa54a14280e128 (patch) | |
| tree | 2bd9090f4bcf01e9c9e43c0d52fcbf80295ca6c0 /src/qml/jsapi/qjsvalue.cpp | |
| parent | 3f3652e43fc001df728ef00403b18d3202e2726a (diff) | |
Cleanups
Remove duplicated methods. Remove some mostly unused methods,
and simplify some others.
Change-Id: I605b249e54417bb32c3dfc8e22f2c8b6b684a1e1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsapi/qjsvalue.cpp')
| -rw-r--r-- | src/qml/jsapi/qjsvalue.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/jsapi/qjsvalue.cpp b/src/qml/jsapi/qjsvalue.cpp index d57b8dcc16..54480abe88 100644 --- a/src/qml/jsapi/qjsvalue.cpp +++ b/src/qml/jsapi/qjsvalue.cpp @@ -648,7 +648,7 @@ QJSValue QJSValue::call(const QJSValueList &args) if (engine->hasException) result = engine->catchException(); - return QJSValue(engine, result.asReturnedValue()); + return QJSValue(engine, result->asReturnedValue()); } /*! @@ -704,7 +704,7 @@ QJSValue QJSValue::callWithInstance(const QJSValue &instance, const QJSValueList if (engine->hasException) result = engine->catchException(); - return QJSValue(engine, result.asReturnedValue()); + return QJSValue(engine, result->asReturnedValue()); } /*! @@ -752,7 +752,7 @@ QJSValue QJSValue::callAsConstructor(const QJSValueList &args) if (engine->hasException) result = engine->catchException(); - return QJSValue(engine, result.asReturnedValue()); + return QJSValue(engine, result->asReturnedValue()); } #ifdef QT_DEPRECATED @@ -1001,7 +1001,7 @@ QJSValue QJSValue::property(const QString& name) const if (engine->hasException) result = engine->catchException(); - return QJSValue(engine, result.asReturnedValue()); + return QJSValue(engine, result->asReturnedValue()); } /*! @@ -1030,7 +1030,7 @@ QJSValue QJSValue::property(quint32 arrayIndex) const QV4::ScopedValue result(scope, arrayIndex == UINT_MAX ? o->get(engine->id_uintMax) : o->getIndexed(arrayIndex)); if (engine->hasException) engine->catchException(); - return QJSValue(engine, result.asReturnedValue()); + return QJSValue(engine, result->asReturnedValue()); } /*! |