diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-11-01 09:19:55 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-11-13 08:56:36 +0000 |
| commit | cf8e87abaabd2f9aaf643d9563b526a662d3941d (patch) | |
| tree | 204dbc7a47e8be1db4c4b0519efcfa274d090373 /src/qml/jsruntime/qv4stringobject.cpp | |
| parent | 5c268e5b3a0af4e516e87cadc5904eeefafe4aa2 (diff) | |
Convert methods of RegExp to new calling convention
Change-Id: Ie364357b5e1ecf09eb264181e11b0247b07fad6c
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4stringobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4stringobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4stringobject.cpp b/src/qml/jsruntime/qv4stringobject.cpp index 571a638355..f32acc6eed 100644 --- a/src/qml/jsruntime/qv4stringobject.cpp +++ b/src/qml/jsruntime/qv4stringobject.cpp @@ -428,7 +428,7 @@ ReturnedValue StringPrototype::method_match(const BuiltinFunction *b, CallData * qSwap(callData->thisObject, callData->args[0]); if (!global) - return RegExpPrototype::method_exec(b, callData); + return RegExpPrototype::method_exec(b, &callData->thisObject, callData->args, callData->argc()); // rx is now in thisObject RegExpObject *rx = static_cast<RegExpObject *>(&callData->thisObject); @@ -438,7 +438,7 @@ ReturnedValue StringPrototype::method_match(const BuiltinFunction *b, CallData * int previousLastIndex = 0; uint n = 0; while (1) { - Value result = Primitive::fromReturnedValue(RegExpPrototype::execFirstMatch(b, callData)); + Value result = Primitive::fromReturnedValue(RegExpPrototype::execFirstMatch(b, &callData->thisObject, callData->args, callData->argc())); if (result.isNull()) break; int index = rx->lastIndex(); |