aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmllocale.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-11-01 10:46:40 +0100
committerLars Knoll <lars.knoll@qt.io>2017-11-13 08:56:45 +0000
commit4d8c72880cab8db6bdc81b27aa338009054e30fc (patch)
treed6dfb9a819aa3333a6504d0e1961dffe94a3562e /src/qml/qml/qqmllocale.cpp
parent65b360a111f4b19bf1882d2a954a6ccdac7bde07 (diff)
Convert Date methods to new calling convention
Change-Id: I5b80eb9d9f18b113a04461fc8b5217a3695269a4 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/qml/qqmllocale.cpp')
-rw-r--r--src/qml/qml/qqmllocale.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index bbd4cec6f8..3f2a373966 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -90,11 +90,11 @@ ReturnedValue QQmlDateExtension::method_toLocaleString(const BuiltinFunction *b,
{
Scope scope(b);
if (callData->argc() > 2)
- return QV4::DatePrototype::method_toLocaleString(b, callData);
+ return QV4::DatePrototype::method_toLocaleString(b, &callData->thisObject, callData->args, callData->argc());
QV4::DateObject *date = callData->thisObject.as<DateObject>();
if (!date)
- return QV4::DatePrototype::method_toLocaleString(b, callData);
+ return QV4::DatePrototype::method_toLocaleString(b, &callData->thisObject, callData->args, callData->argc());
QDateTime dt = date->toQDateTime();
@@ -105,7 +105,7 @@ ReturnedValue QQmlDateExtension::method_toLocaleString(const BuiltinFunction *b,
}
if (!isLocaleObject(callData->args[0]))
- return QV4::DatePrototype::method_toLocaleString(b, callData); // Use the default Date toLocaleString()
+ return QV4::DatePrototype::method_toLocaleString(b, &callData->thisObject, callData->args, callData->argc()); // Use the default Date toLocaleString()
GET_LOCALE_DATA_RESOURCE(callData->args[0]);
@@ -133,11 +133,11 @@ ReturnedValue QQmlDateExtension::method_toLocaleTimeString(const BuiltinFunction
{
Scope scope(b);
if (callData->argc() > 2)
- return QV4::DatePrototype::method_toLocaleTimeString(b, callData);
+ return QV4::DatePrototype::method_toLocaleTimeString(b, &callData->thisObject, callData->args, callData->argc());
QV4::DateObject *date = callData->thisObject.as<DateObject>();
if (!date)
- return QV4::DatePrototype::method_toLocaleTimeString(b, callData);
+ return QV4::DatePrototype::method_toLocaleTimeString(b, &callData->thisObject, callData->args, callData->argc());
QDateTime dt = date->toQDateTime();
QTime time = dt.time();
@@ -149,7 +149,7 @@ ReturnedValue QQmlDateExtension::method_toLocaleTimeString(const BuiltinFunction
}
if (!isLocaleObject(callData->args[0]))
- return QV4::DatePrototype::method_toLocaleTimeString(b, callData); // Use the default Date toLocaleTimeString()
+ return QV4::DatePrototype::method_toLocaleTimeString(b, &callData->thisObject, callData->args, callData->argc()); // Use the default Date toLocaleTimeString()
GET_LOCALE_DATA_RESOURCE(callData->args[0]);
@@ -177,11 +177,11 @@ ReturnedValue QQmlDateExtension::method_toLocaleDateString(const BuiltinFunction
{
Scope scope(b);
if (callData->argc() > 2)
- return QV4::DatePrototype::method_toLocaleDateString(b, callData);
+ return QV4::DatePrototype::method_toLocaleDateString(b, &callData->thisObject, callData->args, callData->argc());
QV4::DateObject *dateObj = callData->thisObject.as<DateObject>();
if (!dateObj)
- return QV4::DatePrototype::method_toLocaleDateString(b, callData);
+ return QV4::DatePrototype::method_toLocaleDateString(b, &callData->thisObject, callData->args, callData->argc());
QDateTime dt = dateObj->toQDateTime();
QDate date = dt.date();
@@ -193,7 +193,7 @@ ReturnedValue QQmlDateExtension::method_toLocaleDateString(const BuiltinFunction
}
if (!isLocaleObject(callData->args[0]))
- return QV4::DatePrototype::method_toLocaleDateString(b, callData); // Use the default Date toLocaleDateString()
+ return QV4::DatePrototype::method_toLocaleDateString(b, &callData->thisObject, callData->args, callData->argc()); // Use the default Date toLocaleDateString()
GET_LOCALE_DATA_RESOURCE(callData->args[0]);