diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-11-11 17:27:49 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-14 13:00:51 +0100 |
| commit | 353402344d0bbf20bc0003324ab6e8d7f67ee90d (patch) | |
| tree | 2ca98c94c37ed26cd9b94c03a92913f0bafac840 /src/qml/jsruntime/qv4script.cpp | |
| parent | afbf1f74af678af0eda76035133406aa8883408a (diff) | |
Replaced more usages of Returned<T> with Heap::T*
Change-Id: I451128ee71610bfeb71139c28da89a00a8209ec6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4script.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4script.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index 956c48e74b..e261cda414 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -109,7 +109,7 @@ Heap::QmlBindingWrapper::QmlBindingWrapper(QV4::ExecutionContext *scope, Functio o->defineReadonlyProperty(scope->d()->engine->id_length, Primitive::fromInt32(1)); - o->d()->qmlContext = s.engine->currentContext()->newQmlContext(o, qml)->getPointer()->d(); + o->d()->qmlContext = s.engine->currentContext()->newQmlContext(o, qml); s.engine->popContext(); } @@ -127,7 +127,7 @@ Heap::QmlBindingWrapper::QmlBindingWrapper(QV4::ExecutionContext *scope, QV4::Ob o->defineReadonlyProperty(scope->d()->engine->id_length, Primitive::fromInt32(1)); - o->d()->qmlContext = s.engine->currentContext()->newQmlContext(o, qml)->getPointer()->d(); + o->d()->qmlContext = s.engine->currentContext()->newQmlContext(o, qml); s.engine->popContext(); } @@ -168,7 +168,7 @@ static ReturnedValue signalParameterGetter(QV4::CallContext *ctx, uint parameter return signalEmittingContext->argument(parameterIndex); } -Returned<FunctionObject> *QmlBindingWrapper::createQmlCallableForFunction(QQmlContextData *qmlContext, QObject *scopeObject, Function *runtimeFunction, const QList<QByteArray> &signalParameters, QString *error) +Heap::FunctionObject *QmlBindingWrapper::createQmlCallableForFunction(QQmlContextData *qmlContext, QObject *scopeObject, Function *runtimeFunction, const QList<QByteArray> &signalParameters, QString *error) { ExecutionEngine *engine = QQmlEnginePrivate::getV4Engine(qmlContext->engine); QV4::Scope valueScope(engine); @@ -192,7 +192,7 @@ Returned<FunctionObject> *QmlBindingWrapper::createQmlCallableForFunction(QQmlCo } QV4::ScopedFunctionObject function(valueScope, QV4::FunctionObject::createScriptFunction(wrapperContext, runtimeFunction)); - return function->asReturned<FunctionObject>(); + return function->d(); } Script::Script(ExecutionEngine *v4, Object *qml, CompiledData::CompilationUnit *compilationUnit) |