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/qjsengine.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/qjsengine.cpp')
| -rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 413e0eedaf..321a659d38 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -323,7 +323,7 @@ QJSValue QJSEngine::evaluate(const QString& program, const QString& fileName, in result = v4->catchException(); if (ctx->d() != v4->rootContext()) v4->popContext(); - return QJSValue(v4, result.asReturnedValue()); + return QJSValue(v4, result->asReturnedValue()); } /*! @@ -338,7 +338,7 @@ QJSValue QJSEngine::newObject() { QV4::Scope scope(d->m_v4Engine); QV4::ScopedValue v(scope, d->m_v4Engine->newObject()); - return QJSValue(d->m_v4Engine, v.asReturnedValue()); + return QJSValue(d->m_v4Engine, v->asReturnedValue()); } /*! @@ -387,7 +387,7 @@ QJSValue QJSEngine::newQObject(QObject *object) QQmlEngine::setObjectOwnership(object, QQmlEngine::JavaScriptOwnership); } QV4::ScopedValue v(scope, QV4::QObjectWrapper::wrap(v4, object)); - return QJSValue(v4, v.asReturnedValue()); + return QJSValue(v4, v->asReturnedValue()); } /*! @@ -405,7 +405,7 @@ QJSValue QJSEngine::globalObject() const Q_D(const QJSEngine); QV4::Scope scope(d->m_v4Engine); QV4::ScopedValue v(scope, d->m_v4Engine->globalObject()); - return QJSValue(d->m_v4Engine, v.asReturnedValue()); + return QJSValue(d->m_v4Engine, v->asReturnedValue()); } /*! @@ -417,7 +417,7 @@ QJSValue QJSEngine::create(int type, const void *ptr) Q_D(QJSEngine); QV4::Scope scope(d->m_v4Engine); QV4::ScopedValue v(scope, scope.engine->metaTypeToJS(type, ptr)); - return QJSValue(d->m_v4Engine, v.asReturnedValue()); + return QJSValue(d->m_v4Engine, v->asReturnedValue()); } /*! |