diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-09-11 13:55:01 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:13:18 +0200 |
commit | 1a2a83f80ba4ecc28eba72af57c81bd43a45946c (patch) | |
tree | c2e4eb4d9bb57873ca340f6bbbf2342b36c91452 /src/qml/jsruntime/qv4functionobject_p.h | |
parent | 826550af450b39f47a3c00ec316acf1e317f12c6 (diff) |
Use a ReturnedValue for Managed::call()
Change-Id: Ief2d75e9789dd367c603d90dc0fe5316a0d055e3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject_p.h')
-rw-r--r-- | src/qml/jsruntime/qv4functionobject_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h index d694d28462..bad62af6f3 100644 --- a/src/qml/jsruntime/qv4functionobject_p.h +++ b/src/qml/jsruntime/qv4functionobject_p.h @@ -118,11 +118,11 @@ struct Q_QML_EXPORT FunctionObject: Object { Value newInstance(); static Value construct(Managed *that, CallData *); - static Value call(Managed *that, CallData *d); + static ReturnedValue call(Managed *that, CallData *d); inline Value construct(CallData *callData) { return vtbl->construct(this, callData); } - inline Value call(CallData *callData) { + inline ReturnedValue call(CallData *callData) { return vtbl->call(this, callData); } @@ -143,7 +143,7 @@ struct FunctionCtor: FunctionObject FunctionCtor(ExecutionContext *scope); static Value construct(Managed *that, CallData *callData); - static Value call(Managed *that, CallData *callData); + static ReturnedValue call(Managed *that, CallData *callData); protected: static const ManagedVTable static_vtbl; @@ -166,7 +166,7 @@ struct BuiltinFunctionOld: FunctionObject { BuiltinFunctionOld(ExecutionContext *scope, String *name, Value (*code)(SimpleCallContext *)); static Value construct(Managed *, CallData *); - static Value call(Managed *that, CallData *callData); + static ReturnedValue call(Managed *that, CallData *callData); protected: static const ManagedVTable static_vtbl; @@ -194,7 +194,7 @@ struct IndexedBuiltinFunction: FunctionObject return Value::undefinedValue(); } - static Value call(Managed *that, CallData *callData); + static ReturnedValue call(Managed *that, CallData *callData); }; @@ -202,7 +202,7 @@ struct ScriptFunction: FunctionObject { ScriptFunction(ExecutionContext *scope, Function *function); static Value construct(Managed *, CallData *callData); - static Value call(Managed *that, CallData *callData); + static ReturnedValue call(Managed *that, CallData *callData); protected: static const ManagedVTable static_vtbl; @@ -212,7 +212,7 @@ struct SimpleScriptFunction: FunctionObject { SimpleScriptFunction(ExecutionContext *scope, Function *function); static Value construct(Managed *, CallData *callData); - static Value call(Managed *that, CallData *callData); + static ReturnedValue call(Managed *that, CallData *callData); protected: static const ManagedVTable static_vtbl; @@ -228,7 +228,7 @@ struct BoundFunction: FunctionObject { static Value construct(Managed *, CallData *d); - static Value call(Managed *that, CallData *dd); + static ReturnedValue call(Managed *that, CallData *dd); static const ManagedVTable static_vtbl; static void destroy(Managed *); |