diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-06 12:44:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-11 13:01:57 +0200 |
| commit | f9fda643ab7aa1a66e4816382f0e66499818f42a (patch) | |
| tree | 10d537491f648945632ac7181557c157c891e002 /src/qml/jsruntime/qv4objectproto.cpp | |
| parent | a23158a41291055aa0f546869e4c9f8efb19c2dc (diff) | |
Change signature of call/construct() to take a pointer to a CallData
Change-Id: I5467aadba083e4b01fb0a7170946695207033680
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4objectproto.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4objectproto.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4objectproto.cpp b/src/qml/jsruntime/qv4objectproto.cpp index 23224fc1fe..99ac4dd0df 100644 --- a/src/qml/jsruntime/qv4objectproto.cpp +++ b/src/qml/jsruntime/qv4objectproto.cpp @@ -79,25 +79,25 @@ ObjectCtor::ObjectCtor(ExecutionContext *scope) vtbl = &static_vtbl; } -Value ObjectCtor::construct(Managed *that, const CallData &d) +Value ObjectCtor::construct(Managed *that, CallData *callData) { ObjectCtor *ctor = static_cast<ObjectCtor *>(that); ExecutionEngine *v4 = that->engine(); - if (!d.argc || d.args[0].isUndefined() || d.args[0].isNull()) { + if (!callData->argc || callData->args[0].isUndefined() || callData->args[0].isNull()) { Object *obj = v4->newObject(); Value proto = ctor->get(v4->id_prototype); if (proto.isObject()) obj->setPrototype(proto.objectValue()); return Value::fromObject(obj); } - return __qmljs_to_object(v4->current, d.args[0]); + return __qmljs_to_object(v4->current, callData->args[0]); } -Value ObjectCtor::call(Managed *m, const CallData &d) +Value ObjectCtor::call(Managed *m, CallData *callData) { - if (!d.argc || d.args[0].isUndefined() || d.args[0].isNull()) + if (!callData->argc || callData->args[0].isUndefined() || callData->args[0].isNull()) return Value::fromObject(m->engine()->newObject()); - return __qmljs_to_object(m->engine()->current, d.args[0]); + return __qmljs_to_object(m->engine()->current, callData->args[0]); } void ObjectPrototype::init(ExecutionContext *ctx, const Value &ctor) |