Convert ExecutionContext to new storage scheme

Change-Id: I9fcc13da5360f37cef3149b114ed9263b9b74281
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 126 insertions, 126 deletions

diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index 395a510b03..c66b5920d9 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -82,36 +82,36 @@ void QQmlDateExtension::registerExtension(QV4::ExecutionEngine *engine)
 
 QV4::ReturnedValue QQmlDateExtension::method_toLocaleString(QV4::CallContext *ctx)
 {
-    if (ctx->callData->argc > 2)
+    if (ctx->d()->callData->argc > 2)
         return QV4::DatePrototype::method_toLocaleString(ctx);
 
     QV4::Scope scope(ctx);
 
-    QV4::DateObject *date = ctx->callData->thisObject.asDateObject();
+    QV4::DateObject *date = ctx->d()->callData->thisObject.asDateObject();
     if (!date)
         return QV4::DatePrototype::method_toLocaleString(ctx);
 
     QDateTime dt = date->toQDateTime();
 
-    if (ctx->callData->argc == 0) {
+    if (ctx->d()->callData->argc == 0) {
         // Use QLocale for standard toLocaleString() function
         QLocale locale;
-        return ctx->engine->newString(locale.toString(dt))->asReturnedValue();
+        return ctx->d()->engine->newString(locale.toString(dt))->asReturnedValue();
     }
 
-    if (!isLocaleObject(ctx->callData->args[0]))
+    if (!isLocaleObject(ctx->d()->callData->args[0]))
         return QV4::DatePrototype::method_toLocaleString(ctx); // Use the default Date toLocaleString()
 
-    GET_LOCALE_DATA_RESOURCE(ctx->callData->args[0]);
+    GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
 
     QLocale::FormatType enumFormat = QLocale::LongFormat;
     QString formattedDt;
-    if (ctx->callData->argc == 2) {
-        if (ctx->callData->args[1].isString()) {
-            QString format = ctx->callData->args[1].stringValue()->toQString();
+    if (ctx->d()->callData->argc == 2) {
+        if (ctx->d()->callData->args[1].isString()) {
+            QString format = ctx->d()->callData->args[1].stringValue()->toQString();
             formattedDt = r->d()->locale.toString(dt, format);
-        } else if (ctx->callData->args[1].isNumber()) {
-            quint32 intFormat = ctx->callData->args[1].toNumber();
+        } else if (ctx->d()->callData->args[1].isNumber()) {
+            quint32 intFormat = ctx->d()->callData->args[1].toNumber();
             QLocale::FormatType format = QLocale::FormatType(intFormat);
             formattedDt = r->d()->locale.toString(dt, format);
         } else {
@@ -121,42 +121,42 @@ QV4::ReturnedValue QQmlDateExtension::method_toLocaleString(QV4::CallContext *ct
          formattedDt = r->d()->locale.toString(dt, enumFormat);
     }
 
-    return ctx->engine->newString(formattedDt)->asReturnedValue();
+    return ctx->d()->engine->newString(formattedDt)->asReturnedValue();
 }
 
 QV4::ReturnedValue QQmlDateExtension::method_toLocaleTimeString(QV4::CallContext *ctx)
 {
-    if (ctx->callData->argc > 2)
+    if (ctx->d()->callData->argc > 2)
         return QV4::DatePrototype::method_toLocaleTimeString(ctx);
 
     QV4::Scope scope(ctx);
 
-    QV4::DateObject *date = ctx->callData->thisObject.asDateObject();
+    QV4::DateObject *date = ctx->d()->callData->thisObject.asDateObject();
     if (!date)
         return QV4::DatePrototype::method_toLocaleTimeString(ctx);
 
     QDateTime dt = date->toQDateTime();
     QTime time = dt.time();
 
-    if (ctx->callData->argc == 0) {
+    if (ctx->d()->callData->argc == 0) {
         // Use QLocale for standard toLocaleString() function
         QLocale locale;
-        return ctx->engine->newString(locale.toString(time))->asReturnedValue();
+        return ctx->d()->engine->newString(locale.toString(time))->asReturnedValue();
     }
 
-    if (!isLocaleObject(ctx->callData->args[0]))
+    if (!isLocaleObject(ctx->d()->callData->args[0]))
         return QV4::DatePrototype::method_toLocaleTimeString(ctx); // Use the default Date toLocaleTimeString()
 
-    GET_LOCALE_DATA_RESOURCE(ctx->callData->args[0]);
+    GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
 
     QLocale::FormatType enumFormat = QLocale::LongFormat;
     QString formattedTime;
-    if (ctx->callData->argc == 2) {
-        if (ctx->callData->args[1].isString()) {
-            QString format = ctx->callData->args[1].stringValue()->toQString();
+    if (ctx->d()->callData->argc == 2) {
+        if (ctx->d()->callData->args[1].isString()) {
+            QString format = ctx->d()->callData->args[1].stringValue()->toQString();
             formattedTime = r->d()->locale.toString(time, format);
-        } else if (ctx->callData->args[1].isNumber()) {
-            quint32 intFormat = ctx->callData->args[1].toNumber();
+        } else if (ctx->d()->callData->args[1].isNumber()) {
+            quint32 intFormat = ctx->d()->callData->args[1].toNumber();
             QLocale::FormatType format = QLocale::FormatType(intFormat);
             formattedTime = r->d()->locale.toString(time, format);
         } else {
@@ -166,42 +166,42 @@ QV4::ReturnedValue QQmlDateExtension::method_toLocaleTimeString(QV4::CallContext
          formattedTime = r->d()->locale.toString(time, enumFormat);
     }
 
-    return ctx->engine->newString(formattedTime)->asReturnedValue();
+    return ctx->d()->engine->newString(formattedTime)->asReturnedValue();
 }
 
 QV4::ReturnedValue QQmlDateExtension::method_toLocaleDateString(QV4::CallContext *ctx)
 {
-    if (ctx->callData->argc > 2)
+    if (ctx->d()->callData->argc > 2)
         return QV4::DatePrototype::method_toLocaleDateString(ctx);
 
     QV4::Scope scope(ctx);
 
-    QV4::DateObject *dateObj = ctx->callData->thisObject.asDateObject();
+    QV4::DateObject *dateObj = ctx->d()->callData->thisObject.asDateObject();
     if (!dateObj)
         return QV4::DatePrototype::method_toLocaleDateString(ctx);
 
     QDateTime dt = dateObj->toQDateTime();
     QDate date = dt.date();
 
-    if (ctx->callData->argc == 0) {
+    if (ctx->d()->callData->argc == 0) {
         // Use QLocale for standard toLocaleString() function
         QLocale locale;
-        return ctx->engine->newString(locale.toString(date))->asReturnedValue();
+        return ctx->d()->engine->newString(locale.toString(date))->asReturnedValue();
     }
 
-    if (!isLocaleObject(ctx->callData->args[0]))
+    if (!isLocaleObject(ctx->d()->callData->args[0]))
         return QV4::DatePrototype::method_toLocaleDateString(ctx); // Use the default Date toLocaleDateString()
 
-    GET_LOCALE_DATA_RESOURCE(ctx->callData->args[0]);
+    GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
 
     QLocale::FormatType enumFormat = QLocale::LongFormat;
     QString formattedDate;
-    if (ctx->callData->argc == 2) {
-        if (ctx->callData->args[1].isString()) {
-            QString format = ctx->callData->args[1].stringValue()->toQString();
+    if (ctx->d()->callData->argc == 2) {
+        if (ctx->d()->callData->args[1].isString()) {
+            QString format = ctx->d()->callData->args[1].stringValue()->toQString();
             formattedDate = r->d()->locale.toString(date, format);
-        } else if (ctx->callData->args[1].isNumber()) {
-            quint32 intFormat = ctx->callData->args[1].toNumber();
+        } else if (ctx->d()->callData->args[1].isNumber()) {
+            quint32 intFormat = ctx->d()->callData->args[1].toNumber();
             QLocale::FormatType format = QLocale::FormatType(intFormat);
             formattedDate = r->d()->locale.toString(date, format);
         } else {
@@ -211,35 +211,35 @@ QV4::ReturnedValue QQmlDateExtension::method_toLocaleDateString(QV4::CallContext
          formattedDate = r->d()->locale.toString(date, enumFormat);
     }
 
-    return ctx->engine->newString(formattedDate)->asReturnedValue();
+    return ctx->d()->engine->newString(formattedDate)->asReturnedValue();
 }
 
 QV4::ReturnedValue QQmlDateExtension::method_fromLocaleString(QV4::CallContext *ctx)
 {
-    QV4::ExecutionEngine * const engine = ctx->engine;
-    if (ctx->callData->argc == 1 && ctx->callData->args[0].isString()) {
+    QV4::ExecutionEngine * const engine = ctx->d()->engine;
+    if (ctx->d()->callData->argc == 1 && ctx->d()->callData->args[0].isString()) {
         QLocale locale;
-        QString dateString = ctx->callData->args[0].stringValue()->toQString();
+        QString dateString = ctx->d()->callData->args[0].stringValue()->toQString();
         QDateTime dt = locale.toDateTime(dateString);
         return QV4::Encode(engine->newDateObject(dt));
     }
 
     QV4::Scope scope(ctx);
 
-    if (ctx->callData->argc < 1 || ctx->callData->argc > 3 || !isLocaleObject(ctx->callData->args[0]))
+    if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 3 || !isLocaleObject(ctx->d()->callData->args[0]))
         V4THROW_ERROR("Locale: Date.fromLocaleString(): Invalid arguments");
 
-    GET_LOCALE_DATA_RESOURCE(ctx->callData->args[0]);
+    GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
 
     QLocale::FormatType enumFormat = QLocale::LongFormat;
     QDateTime dt;
-    QString dateString = ctx->callData->args[1].toQStringNoThrow();
-    if (ctx->callData->argc == 3) {
-        if (ctx->callData->args[2].isString()) {
-            QString format = ctx->callData->args[2].stringValue()->toQString();
+    QString dateString = ctx->d()->callData->args[1].toQStringNoThrow();
+    if (ctx->d()->callData->argc == 3) {
+        if (ctx->d()->callData->args[2].isString()) {
+            QString format = ctx->d()->callData->args[2].stringValue()->toQString();
             dt = r->d()->locale.toDateTime(dateString, format);
-        } else if (ctx->callData->args[2].isNumber()) {
-            quint32 intFormat = ctx->callData->args[2].toNumber();
+        } else if (ctx->d()->callData->args[2].isNumber()) {
+            quint32 intFormat = ctx->d()->callData->args[2].toNumber();
             QLocale::FormatType format = QLocale::FormatType(intFormat);
             dt = r->d()->locale.toDateTime(dateString, format);
         } else {
@@ -254,33 +254,33 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleString(QV4::CallContext *
 
 QV4::ReturnedValue QQmlDateExtension::method_fromLocaleTimeString(QV4::CallContext *ctx)
 {
-    QV4::ExecutionEngine * const engine = ctx->engine;
+    QV4::ExecutionEngine * const engine = ctx->d()->engine;
 
-    if (ctx->callData->argc == 1 && ctx->callData->args[0].isString()) {
+    if (ctx->d()->callData->argc == 1 && ctx->d()->callData->args[0].isString()) {
         QLocale locale;
-        QString timeString = ctx->callData->args[0].stringValue()->toQString();
+        QString timeString = ctx->d()->callData->args[0].stringValue()->toQString();
         QTime time = locale.toTime(timeString);
         QDateTime dt = QDateTime::currentDateTime();
         dt.setTime(time);
         return QV4::Encode(engine->newDateObject(dt));
     }
 
-    if (ctx->callData->argc < 1 || ctx->callData->argc > 3 || !isLocaleObject(ctx->callData->args[0]))
+    if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 3 || !isLocaleObject(ctx->d()->callData->args[0]))
         V4THROW_ERROR("Locale: Date.fromLocaleTimeString(): Invalid arguments");
 
     QV4::Scope scope(ctx);
 
-    GET_LOCALE_DATA_RESOURCE(ctx->callData->args[0]);
+    GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
 
     QLocale::FormatType enumFormat = QLocale::LongFormat;
     QTime tm;
-    QString dateString = ctx->callData->args[1].toQStringNoThrow();
-    if (ctx->callData->argc == 3) {
-        if (ctx->callData->args[2].isString()) {
-            QString format = ctx->callData->args[2].stringValue()->toQString();
+    QString dateString = ctx->d()->callData->args[1].toQStringNoThrow();
+    if (ctx->d()->callData->argc == 3) {
+        if (ctx->d()->callData->args[2].isString()) {
+            QString format = ctx->d()->callData->args[2].stringValue()->toQString();
             tm = r->d()->locale.toTime(dateString, format);
-        } else if (ctx->callData->args[2].isNumber()) {
-            quint32 intFormat = ctx->callData->args[2].toNumber();
+        } else if (ctx->d()->callData->args[2].isNumber()) {
+            quint32 intFormat = ctx->d()->callData->args[2].toNumber();
             QLocale::FormatType format = QLocale::FormatType(intFormat);
             tm = r->d()->locale.toTime(dateString, format);
         } else {
@@ -301,31 +301,31 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleTimeString(QV4::CallConte
 
 QV4::ReturnedValue QQmlDateExtension::method_fromLocaleDateString(QV4::CallContext *ctx)
 {
-    QV4::ExecutionEngine * const engine = ctx->engine;
+    QV4::ExecutionEngine * const engine = ctx->d()->engine;
 
-    if (ctx->callData->argc == 1 && ctx->callData->args[0].isString()) {
+    if (ctx->d()->callData->argc == 1 && ctx->d()->callData->args[0].isString()) {
         QLocale locale;
-        QString dateString = ctx->callData->args[0].stringValue()->toQString();
+        QString dateString = ctx->d()->callData->args[0].stringValue()->toQString();
         QDate date = locale.toDate(dateString);
         return QV4::Encode(engine->newDateObject(QDateTime(date)));
     }
 
-    if (ctx->callData->argc < 1 || ctx->callData->argc > 3 || !isLocaleObject(ctx->callData->args[0]))
+    if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 3 || !isLocaleObject(ctx->d()->callData->args[0]))
         V4THROW_ERROR("Locale: Date.fromLocaleDateString(): Invalid arguments");
 
     QV4::Scope scope(ctx);
 
-    GET_LOCALE_DATA_RESOURCE(ctx->callData->args[0]);
+    GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
 
     QLocale::FormatType enumFormat = QLocale::LongFormat;
     QDate dt;
-    QString dateString = ctx->callData->args[1].toQStringNoThrow();
-    if (ctx->callData->argc == 3) {
-        if (ctx->callData->args[2].isString()) {
-            QString format = ctx->callData->args[2].stringValue()->toQString();
+    QString dateString = ctx->d()->callData->args[1].toQStringNoThrow();
+    if (ctx->d()->callData->argc == 3) {
+        if (ctx->d()->callData->args[2].isString()) {
+            QString format = ctx->d()->callData->args[2].stringValue()->toQString();
             dt = r->d()->locale.toDate(dateString, format);
-        } else if (ctx->callData->args[2].isNumber()) {
-            quint32 intFormat = ctx->callData->args[2].toNumber();
+        } else if (ctx->d()->callData->args[2].isNumber()) {
+            quint32 intFormat = ctx->d()->callData->args[2].toNumber();
             QLocale::FormatType format = QLocale::FormatType(intFormat);
             dt = r->d()->locale.toDate(dateString, format);
         } else {
@@ -340,7 +340,7 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleDateString(QV4::CallConte
 
 QV4::ReturnedValue QQmlDateExtension::method_timeZoneUpdated(QV4::CallContext *ctx)
 {
-    if (ctx->callData->argc != 0)
+    if (ctx->d()->callData->argc != 0)
         V4THROW_ERROR("Locale: Date.timeZoneUpdated(): Invalid arguments");
 
     QV4::DatePrototype::timezoneUpdated();
@@ -360,75 +360,75 @@ void QQmlNumberExtension::registerExtension(QV4::ExecutionEngine *engine)
 
 QV4::ReturnedValue QQmlNumberExtension::method_toLocaleString(QV4::CallContext *ctx)
 {
-    if (ctx->callData->argc > 3)
+    if (ctx->d()->callData->argc > 3)
         V4THROW_ERROR("Locale: Number.toLocaleString(): Invalid arguments");
 
-    double number = ctx->callData->thisObject.toNumber();
+    double number = ctx->d()->callData->thisObject.toNumber();
 
-    if (ctx->callData->argc == 0) {
+    if (ctx->d()->callData->argc == 0) {
         // Use QLocale for standard toLocaleString() function
         QLocale locale;
-        return ctx->engine->newString(locale.toString(number))->asReturnedValue();
+        return ctx->d()->engine->newString(locale.toString(number))->asReturnedValue();
     }
 
-    if (!isLocaleObject(ctx->callData->args[0]))
+    if (!isLocaleObject(ctx->d()->callData->args[0]))
         return QV4::NumberPrototype::method_toLocaleString(ctx); // Use the default Number toLocaleString()
 
     QV4::Scope scope(ctx);
 
-    GET_LOCALE_DATA_RESOURCE(ctx->callData->args[0]);
+    GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
 
     quint16 format = 'f';
-    if (ctx->callData->argc > 1) {
-        if (!ctx->callData->args[1].isString())
+    if (ctx->d()->callData->argc > 1) {
+        if (!ctx->d()->callData->args[1].isString())
             V4THROW_ERROR("Locale: Number.toLocaleString(): Invalid arguments");
-        QV4::String *fs = ctx->callData->args[1].toString(ctx);
+        QV4::String *fs = ctx->d()->callData->args[1].toString(ctx);
         if (fs->length())
             format = fs->toQString().at(0).unicode();
     }
     int prec = 2;
-    if (ctx->callData->argc > 2) {
-        if (!ctx->callData->args[2].isNumber())
+    if (ctx->d()->callData->argc > 2) {
+        if (!ctx->d()->callData->args[2].isNumber())
             V4THROW_ERROR("Locale: Number.toLocaleString(): Invalid arguments");
-         prec = ctx->callData->args[2].toInt32();
+         prec = ctx->d()->callData->args[2].toInt32();
     }
 
-    return ctx->engine->newString(r->d()->locale.toString(number, (char)format, prec))->asReturnedValue();
+    return ctx->d()->engine->newString(r->d()->locale.toString(number, (char)format, prec))->asReturnedValue();
 }
 
 QV4::ReturnedValue QQmlNumberExtension::method_toLocaleCurrencyString(QV4::CallContext *ctx)
 {
-    if (ctx->callData->argc > 2)
+    if (ctx->d()->callData->argc > 2)
         V4THROW_ERROR("Locale: Number.toLocaleCurrencyString(): Invalid arguments");
 
-    double number = ctx->callData->thisObject.toNumber();
+    double number = ctx->d()->callData->thisObject.toNumber();
 
-    if (ctx->callData->argc == 0) {
+    if (ctx->d()->callData->argc == 0) {
         // Use QLocale for standard toLocaleString() function
         QLocale locale;
-        return ctx->engine->newString(locale.toString(number))->asReturnedValue();
+        return ctx->d()->engine->newString(locale.toString(number))->asReturnedValue();
     }
 
-    if (!isLocaleObject(ctx->callData->args[0]))
+    if (!isLocaleObject(ctx->d()->callData->args[0]))
         V4THROW_ERROR("Locale: Number.toLocaleCurrencyString(): Invalid arguments");
 
     QV4::Scope scope(ctx);
 
-    GET_LOCALE_DATA_RESOURCE(ctx->callData->args[0]);
+    GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
 
     QString symbol;
-    if (ctx->callData->argc > 1) {
-        if (!ctx->callData->args[1].isString())
+    if (ctx->d()->callData->argc > 1) {
+        if (!ctx->d()->callData->args[1].isString())
             V4THROW_ERROR("Locale: Number.toLocaleString(): Invalid arguments");
-        symbol = ctx->callData->args[1].toQStringNoThrow();
+        symbol = ctx->d()->callData->args[1].toQStringNoThrow();
     }
 
-    return ctx->engine->newString(r->d()->locale.toCurrencyString(number, symbol))->asReturnedValue();
+    return ctx->d()->engine->newString(r->d()->locale.toCurrencyString(number, symbol))->asReturnedValue();
 }
 
 QV4::ReturnedValue QQmlNumberExtension::method_fromLocaleString(QV4::CallContext *ctx)
 {
-    if (ctx->callData->argc < 1 || ctx->callData->argc > 2)
+    if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 2)
         V4THROW_ERROR("Locale: Number.fromLocaleString(): Invalid arguments");
 
     int numberIdx = 0;
@@ -436,17 +436,17 @@ QV4::ReturnedValue QQmlNumberExtension::method_fromLocaleString(QV4::CallContext
 
     QV4::Scope scope(ctx);
 
-    if (ctx->callData->argc == 2) {
-        if (!isLocaleObject(ctx->callData->args[0]))
+    if (ctx->d()->callData->argc == 2) {
+        if (!isLocaleObject(ctx->d()->callData->args[0]))
             V4THROW_ERROR("Locale: Number.fromLocaleString(): Invalid arguments");
 
-        GET_LOCALE_DATA_RESOURCE(ctx->callData->args[0]);
+        GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
         locale = r->d()->locale;
 
         numberIdx = 1;
     }
 
-    QV4::String *ns = ctx->callData->args[numberIdx].toString(ctx);
+    QV4::String *ns = ctx->d()->callData->args[numberIdx].toString(ctx);
     if (!ns->length())
         return QV4::Encode(Q_QNAN);
 
@@ -499,7 +499,7 @@ QV4::ReturnedValue QQmlLocaleData::method_get_weekDays(QV4::CallContext *ctx)
 
     QList<Qt::DayOfWeek> days = locale->weekdays();
 
-    QV4::Scoped<QV4::ArrayObject> result(scope, ctx->engine->newArrayObject());
+    QV4::Scoped<QV4::ArrayObject> result(scope, ctx->d()->engine->newArrayObject());
     result->arrayReserve(days.size());
     for (int i = 0; i < days.size(); ++i) {
         int day = days.at(i);
@@ -520,11 +520,11 @@ QV4::ReturnedValue QQmlLocaleData::method_get_uiLanguages(QV4::CallContext *ctx)
         return QV4::Encode::undefined();
 
     QStringList langs = locale->uiLanguages();
-    QV4::Scoped<QV4::ArrayObject> result(scope, ctx->engine->newArrayObject());
+    QV4::Scoped<QV4::ArrayObject> result(scope, ctx->d()->engine->newArrayObject());
     result->arrayReserve(langs.size());
     QV4::ScopedValue v(scope);
     for (int i = 0; i < langs.size(); ++i)
-        result->arrayPut(i, (v = ctx->engine->newString(langs.at(i))));
+        result->arrayPut(i, (v = ctx->d()->engine->newString(langs.at(i))));
 
     result->setArrayLengthUnchecked(langs.size());
 
@@ -537,16 +537,16 @@ QV4::ReturnedValue QQmlLocaleData::method_currencySymbol(QV4::CallContext *ctx)
     if (!locale)
         return QV4::Encode::undefined();
 
-    if (ctx->callData->argc > 1)
+    if (ctx->d()->callData->argc > 1)
         V4THROW_ERROR("Locale: currencySymbol(): Invalid arguments");
 
     QLocale::CurrencySymbolFormat format = QLocale::CurrencySymbol;
-    if (ctx->callData->argc == 1) {
-        quint32 intFormat = ctx->callData->args[0].toNumber();
+    if (ctx->d()->callData->argc == 1) {
+        quint32 intFormat = ctx->d()->callData->args[0].toNumber();
         format = QLocale::CurrencySymbolFormat(intFormat);
     }
 
-    return ctx->engine->newString(locale->currencySymbol(format))->asReturnedValue();
+    return ctx->d()->engine->newString(locale->currencySymbol(format))->asReturnedValue();
 }
 
 #define LOCALE_FORMAT(FUNC) \
@@ -554,14 +554,14 @@ QV4::ReturnedValue QQmlLocaleData::method_ ##FUNC (QV4::CallContext *ctx) { \
     QLocale *locale = getThisLocale(ctx); \
     if (!locale) \
         return QV4::Encode::undefined(); \
-    if (ctx->callData->argc > 1) \
+    if (ctx->d()->callData->argc > 1) \
         V4THROW_ERROR("Locale: " #FUNC "(): Invalid arguments"); \
     QLocale::FormatType format = QLocale::LongFormat;\
-    if (ctx->callData->argc == 1) { \
-        quint32 intFormat = ctx->callData->args[0].toUInt32(); \
+    if (ctx->d()->callData->argc == 1) { \
+        quint32 intFormat = ctx->d()->callData->args[0].toUInt32(); \
         format = QLocale::FormatType(intFormat); \
     } \
-    return ctx->engine->newString(locale-> FUNC (format))->asReturnedValue(); \
+    return ctx->engine()->newString(locale-> FUNC (format))->asReturnedValue(); \
 }
 
 LOCALE_FORMAT(dateTimeFormat)
@@ -574,16 +574,16 @@ QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::CallContext *ctx) {
     QLocale *locale = getThisLocale(ctx); \
     if (!locale) \
         return QV4::Encode::undefined(); \
-    if (ctx->callData->argc < 1 || ctx->callData->argc > 2) \
+    if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 2) \
         V4THROW_ERROR("Locale: " #VARIABLE "(): Invalid arguments"); \
     QLocale::FormatType enumFormat = QLocale::LongFormat; \
-    int idx = ctx->callData->args[0].toInt32() + 1; \
+    int idx = ctx->d()->callData->args[0].toInt32() + 1; \
     if (idx < 1 || idx > 12) \
         V4THROW_ERROR("Locale: Invalid month"); \
     QString name; \
-    if (ctx->callData->argc == 2) { \
-        if (ctx->callData->args[1].isNumber()) { \
-            quint32 intFormat = ctx->callData->args[1].toUInt32(); \
+    if (ctx->d()->callData->argc == 2) { \
+        if (ctx->d()->callData->args[1].isNumber()) { \
+            quint32 intFormat = ctx->d()->callData->args[1].toUInt32(); \
             QLocale::FormatType format = QLocale::FormatType(intFormat); \
             name = locale-> VARIABLE(idx, format); \
         } else { \
@@ -592,7 +592,7 @@ QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::CallContext *ctx) {
     } else { \
         name = locale-> VARIABLE(idx, enumFormat); \
     } \
-    return ctx->engine->newString(name)->asReturnedValue(); \
+    return ctx->engine()->newString(name)->asReturnedValue(); \
 }
 
 // 0 -> 7 as Qt::Sunday is 7, but Sunday is 0 in JS Date
@@ -601,17 +601,17 @@ QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::CallContext *ctx) {
     QLocale *locale = getThisLocale(ctx); \
     if (!locale) \
         return QV4::Encode::undefined(); \
-    if (ctx->callData->argc < 1 || ctx->callData->argc > 2) \
+    if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 2) \
         V4THROW_ERROR("Locale: " #VARIABLE "(): Invalid arguments"); \
     QLocale::FormatType enumFormat = QLocale::LongFormat; \
-    int idx = ctx->callData->args[0].toInt32(); \
+    int idx = ctx->d()->callData->args[0].toInt32(); \
     if (idx < 0 || idx > 7) \
         V4THROW_ERROR("Locale: Invalid day"); \
     if (idx == 0) idx = 7; \
     QString name; \
-    if (ctx->callData->argc == 2) { \
-        if (ctx->callData->args[1].isNumber()) { \
-            quint32 intFormat = ctx->callData->args[1].toUInt32(); \
+    if (ctx->d()->callData->argc == 2) { \
+        if (ctx->d()->callData->args[1].isNumber()) { \
+            quint32 intFormat = ctx->d()->callData->args[1].toUInt32(); \
             QLocale::FormatType format = QLocale::FormatType(intFormat); \
             name = locale-> VARIABLE(idx, format); \
         } else { \
@@ -620,7 +620,7 @@ QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::CallContext *ctx) {
     } else { \
         name = locale-> VARIABLE(idx, enumFormat); \
     } \
-    return ctx->engine->newString(name)->asReturnedValue(); \
+    return ctx->engine()->newString(name)->asReturnedValue(); \
 }
 
 LOCALE_FORMATTED_MONTHNAME(monthName)
@@ -633,7 +633,7 @@ LOCALE_FORMATTED_DAYNAME(standaloneDayName)
     QLocale *locale = getThisLocale(ctx); \
     if (!locale) \
         return QV4::Encode::undefined(); \
-    return ctx->engine->newString(locale-> VARIABLE())->asReturnedValue();\
+    return ctx->engine()->newString(locale-> VARIABLE())->asReturnedValue();\
 }
 
 LOCALE_STRING_PROPERTY(name)
@@ -828,14 +828,14 @@ void QQmlLocale::registerStringLocaleCompare(QV4::ExecutionEngine *engine)
 
 QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::CallContext *ctx)
 {
-    if (ctx->callData->argc != 1 || (!ctx->callData->args[0].isString() && !ctx->callData->args[0].asStringObject()))
+    if (ctx->d()->callData->argc != 1 || (!ctx->d()->callData->args[0].isString() && !ctx->d()->callData->args[0].asStringObject()))
         return QV4::StringPrototype::method_localeCompare(ctx);
 
-    if (!ctx->callData->thisObject.isString() && !ctx->callData->thisObject.asStringObject())
+    if (!ctx->d()->callData->thisObject.isString() && !ctx->d()->callData->thisObject.asStringObject())
         return QV4::StringPrototype::method_localeCompare(ctx);
 
-    QString thisString = ctx->callData->thisObject.toQStringNoThrow();
-    QString thatString = ctx->callData->args[0].toQStringNoThrow();
+    QString thisString = ctx->d()->callData->thisObject.toQStringNoThrow();
+    QString thatString = ctx->d()->callData->args[0].toQStringNoThrow();
 
     return QV4::Encode(QString::localeAwareCompare(thisString, thatString));
 }