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/qv4regexpobject.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/qv4regexpobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4regexpobject.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp index ed4d3e3d17..420e29096b 100644 --- a/src/qml/jsruntime/qv4regexpobject.cpp +++ b/src/qml/jsruntime/qv4regexpobject.cpp @@ -229,10 +229,10 @@ RegExpCtor::RegExpCtor(ExecutionContext *scope) vtbl = &static_vtbl; } -Value RegExpCtor::construct(Managed *m, const CallData &d) +Value RegExpCtor::construct(Managed *m, CallData *callData) { - Value r = d.argc > 0 ? d.args[0] : Value::undefinedValue(); - Value f = d.argc > 1 ? d.args[1] : Value::undefinedValue(); + Value r = callData->argc > 0 ? callData->args[0] : Value::undefinedValue(); + Value f = callData->argc > 1 ? callData->args[1] : Value::undefinedValue(); ExecutionContext *ctx = m->engine()->current; if (RegExpObject *re = r.as<RegExpObject>()) { if (!f.isUndefined()) @@ -273,14 +273,14 @@ Value RegExpCtor::construct(Managed *m, const CallData &d) return Value::fromObject(o); } -Value RegExpCtor::call(Managed *that, const CallData &d) +Value RegExpCtor::call(Managed *that, CallData *callData) { - if (d.argc > 0 && d.args[0].as<RegExpObject>()) { - if (d.argc == 1 || d.args[1].isUndefined()) - return d.args[0]; + if (callData->argc > 0 && callData->args[0].as<RegExpObject>()) { + if (callData->argc == 1 || callData->args[1].isUndefined()) + return callData->args[0]; } - return construct(that, d); + return construct(that, callData); } void RegExpPrototype::init(ExecutionContext *ctx, const Value &ctor) |