aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2015-01-15 21:54:12 +0100
committerLars Knoll <lars.knoll@digia.com>2015-01-23 12:30:38 +0100
commitef6b4938b9ec309d5faf0c966cb2b58f3de2ca77 (patch)
tree3d946ad66defb1ec5c60a50e16b6e7883ec33862 /src/qml/qml
parent3dbf4e9a6979802fff55e2f5e6aa54a14280e128 (diff)
Cleanups
Simplify some code in BooleanObject Simplify access to call arguments and thisObject Change-Id: I2f8e844019bc587385608beb02f05b15f827535c Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml')
-rw-r--r--src/qml/qml/qqmlcomponent.cpp14
-rw-r--r--src/qml/qml/qqmllocale.cpp210
-rw-r--r--src/qml/qml/qqmllocale_p.h2
-rw-r--r--src/qml/qml/qqmlvaluetypewrapper.cpp2
-rw-r--r--src/qml/qml/qqmlxmlhttprequest.cpp102
-rw-r--r--src/qml/qml/v8/qqmlbuiltinfunctions.cpp348
6 files changed, 339 insertions, 339 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index 0b76c0f176..428c59767b 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1420,7 +1420,7 @@ QQmlComponentExtension::QQmlComponentExtension(QV4::ExecutionEngine *v4)
QV4::ReturnedValue QV4::QmlIncubatorObject::method_get_object(QV4::CallContext *ctx)
{
QV4::Scope scope(ctx);
- QV4::Scoped<QmlIncubatorObject> o(scope, ctx->d()->callData->thisObject.as<QmlIncubatorObject>());
+ QV4::Scoped<QmlIncubatorObject> o(scope, ctx->thisObject().as<QmlIncubatorObject>());
if (!o)
return ctx->engine()->throwTypeError();
@@ -1430,7 +1430,7 @@ QV4::ReturnedValue QV4::QmlIncubatorObject::method_get_object(QV4::CallContext *
QV4::ReturnedValue QV4::QmlIncubatorObject::method_forceCompletion(QV4::CallContext *ctx)
{
QV4::Scope scope(ctx);
- QV4::Scoped<QmlIncubatorObject> o(scope, ctx->d()->callData->thisObject.as<QmlIncubatorObject>());
+ QV4::Scoped<QmlIncubatorObject> o(scope, ctx->thisObject().as<QmlIncubatorObject>());
if (!o)
return ctx->engine()->throwTypeError();
@@ -1442,7 +1442,7 @@ QV4::ReturnedValue QV4::QmlIncubatorObject::method_forceCompletion(QV4::CallCont
QV4::ReturnedValue QV4::QmlIncubatorObject::method_get_status(QV4::CallContext *ctx)
{
QV4::Scope scope(ctx);
- QV4::Scoped<QmlIncubatorObject> o(scope, ctx->d()->callData->thisObject.as<QmlIncubatorObject>());
+ QV4::Scoped<QmlIncubatorObject> o(scope, ctx->thisObject().as<QmlIncubatorObject>());
if (!o)
return ctx->engine()->throwTypeError();
@@ -1452,7 +1452,7 @@ QV4::ReturnedValue QV4::QmlIncubatorObject::method_get_status(QV4::CallContext *
QV4::ReturnedValue QV4::QmlIncubatorObject::method_get_statusChanged(QV4::CallContext *ctx)
{
QV4::Scope scope(ctx);
- QV4::Scoped<QmlIncubatorObject> o(scope, ctx->d()->callData->thisObject.as<QmlIncubatorObject>());
+ QV4::Scoped<QmlIncubatorObject> o(scope, ctx->thisObject().as<QmlIncubatorObject>());
if (!o)
return ctx->engine()->throwTypeError();
@@ -1462,12 +1462,12 @@ QV4::ReturnedValue QV4::QmlIncubatorObject::method_get_statusChanged(QV4::CallCo
QV4::ReturnedValue QV4::QmlIncubatorObject::method_set_statusChanged(QV4::CallContext *ctx)
{
QV4::Scope scope(ctx);
- QV4::Scoped<QmlIncubatorObject> o(scope, ctx->d()->callData->thisObject.as<QmlIncubatorObject>());
- if (!o || ctx->d()->callData->argc < 1)
+ QV4::Scoped<QmlIncubatorObject> o(scope, ctx->thisObject().as<QmlIncubatorObject>());
+ if (!o || ctx->argc() < 1)
return ctx->engine()->throwTypeError();
- o->d()->statusChanged = ctx->d()->callData->args[0];
+ o->d()->statusChanged = ctx->args()[0];
return QV4::Encode::undefined();
}
diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp
index 5a27739156..34fb585309 100644
--- a/src/qml/qml/qqmllocale.cpp
+++ b/src/qml/qml/qqmllocale.cpp
@@ -76,36 +76,36 @@ void QQmlDateExtension::registerExtension(QV4::ExecutionEngine *engine)
QV4::ReturnedValue QQmlDateExtension::method_toLocaleString(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc > 2)
+ if (ctx->argc() > 2)
return QV4::DatePrototype::method_toLocaleString(ctx);
QV4::Scope scope(ctx);
- QV4::DateObject *date = ctx->d()->callData->thisObject.asDateObject();
+ QV4::DateObject *date = ctx->thisObject().asDateObject();
if (!date)
return QV4::DatePrototype::method_toLocaleString(ctx);
QDateTime dt = date->toQDateTime();
- if (ctx->d()->callData->argc == 0) {
+ if (ctx->argc() == 0) {
// Use QLocale for standard toLocaleString() function
QLocale locale;
return ctx->d()->engine->newString(locale.toString(dt))->asReturnedValue();
}
- if (!isLocaleObject(ctx->d()->callData->args[0]))
+ if (!isLocaleObject(ctx->args()[0]))
return QV4::DatePrototype::method_toLocaleString(ctx); // Use the default Date toLocaleString()
- GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
+ GET_LOCALE_DATA_RESOURCE(ctx->args()[0]);
QLocale::FormatType enumFormat = QLocale::LongFormat;
QString formattedDt;
- if (ctx->d()->callData->argc == 2) {
- if (ctx->d()->callData->args[1].isString()) {
- QString format = ctx->d()->callData->args[1].stringValue()->toQString();
+ if (ctx->argc() == 2) {
+ if (ctx->args()[1].isString()) {
+ QString format = ctx->args()[1].stringValue()->toQString();
formattedDt = r->d()->locale.toString(dt, format);
- } else if (ctx->d()->callData->args[1].isNumber()) {
- quint32 intFormat = ctx->d()->callData->args[1].toNumber();
+ } else if (ctx->args()[1].isNumber()) {
+ quint32 intFormat = ctx->args()[1].toNumber();
QLocale::FormatType format = QLocale::FormatType(intFormat);
formattedDt = r->d()->locale.toString(dt, format);
} else {
@@ -120,37 +120,37 @@ QV4::ReturnedValue QQmlDateExtension::method_toLocaleString(QV4::CallContext *ct
QV4::ReturnedValue QQmlDateExtension::method_toLocaleTimeString(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc > 2)
+ if (ctx->argc() > 2)
return QV4::DatePrototype::method_toLocaleTimeString(ctx);
QV4::Scope scope(ctx);
- QV4::DateObject *date = ctx->d()->callData->thisObject.asDateObject();
+ QV4::DateObject *date = ctx->thisObject().asDateObject();
if (!date)
return QV4::DatePrototype::method_toLocaleTimeString(ctx);
QDateTime dt = date->toQDateTime();
QTime time = dt.time();
- if (ctx->d()->callData->argc == 0) {
+ if (ctx->argc() == 0) {
// Use QLocale for standard toLocaleString() function
QLocale locale;
return ctx->d()->engine->newString(locale.toString(time))->asReturnedValue();
}
- if (!isLocaleObject(ctx->d()->callData->args[0]))
+ if (!isLocaleObject(ctx->args()[0]))
return QV4::DatePrototype::method_toLocaleTimeString(ctx); // Use the default Date toLocaleTimeString()
- GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
+ GET_LOCALE_DATA_RESOURCE(ctx->args()[0]);
QLocale::FormatType enumFormat = QLocale::LongFormat;
QString formattedTime;
- if (ctx->d()->callData->argc == 2) {
- if (ctx->d()->callData->args[1].isString()) {
- QString format = ctx->d()->callData->args[1].stringValue()->toQString();
+ if (ctx->argc() == 2) {
+ if (ctx->args()[1].isString()) {
+ QString format = ctx->args()[1].stringValue()->toQString();
formattedTime = r->d()->locale.toString(time, format);
- } else if (ctx->d()->callData->args[1].isNumber()) {
- quint32 intFormat = ctx->d()->callData->args[1].toNumber();
+ } else if (ctx->args()[1].isNumber()) {
+ quint32 intFormat = ctx->args()[1].toNumber();
QLocale::FormatType format = QLocale::FormatType(intFormat);
formattedTime = r->d()->locale.toString(time, format);
} else {
@@ -165,37 +165,37 @@ QV4::ReturnedValue QQmlDateExtension::method_toLocaleTimeString(QV4::CallContext
QV4::ReturnedValue QQmlDateExtension::method_toLocaleDateString(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc > 2)
+ if (ctx->argc() > 2)
return QV4::DatePrototype::method_toLocaleDateString(ctx);
QV4::Scope scope(ctx);
- QV4::DateObject *dateObj = ctx->d()->callData->thisObject.asDateObject();
+ QV4::DateObject *dateObj = ctx->thisObject().asDateObject();
if (!dateObj)
return QV4::DatePrototype::method_toLocaleDateString(ctx);
QDateTime dt = dateObj->toQDateTime();
QDate date = dt.date();
- if (ctx->d()->callData->argc == 0) {
+ if (ctx->argc() == 0) {
// Use QLocale for standard toLocaleString() function
QLocale locale;
return ctx->d()->engine->newString(locale.toString(date))->asReturnedValue();
}
- if (!isLocaleObject(ctx->d()->callData->args[0]))
+ if (!isLocaleObject(ctx->args()[0]))
return QV4::DatePrototype::method_toLocaleDateString(ctx); // Use the default Date toLocaleDateString()
- GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
+ GET_LOCALE_DATA_RESOURCE(ctx->args()[0]);
QLocale::FormatType enumFormat = QLocale::LongFormat;
QString formattedDate;
- if (ctx->d()->callData->argc == 2) {
- if (ctx->d()->callData->args[1].isString()) {
- QString format = ctx->d()->callData->args[1].stringValue()->toQString();
+ if (ctx->argc() == 2) {
+ if (ctx->args()[1].isString()) {
+ QString format = ctx->args()[1].stringValue()->toQString();
formattedDate = r->d()->locale.toString(date, format);
- } else if (ctx->d()->callData->args[1].isNumber()) {
- quint32 intFormat = ctx->d()->callData->args[1].toNumber();
+ } else if (ctx->args()[1].isNumber()) {
+ quint32 intFormat = ctx->args()[1].toNumber();
QLocale::FormatType format = QLocale::FormatType(intFormat);
formattedDate = r->d()->locale.toString(date, format);
} else {
@@ -211,29 +211,29 @@ QV4::ReturnedValue QQmlDateExtension::method_toLocaleDateString(QV4::CallContext
QV4::ReturnedValue QQmlDateExtension::method_fromLocaleString(QV4::CallContext *ctx)
{
QV4::ExecutionEngine * const engine = ctx->d()->engine;
- if (ctx->d()->callData->argc == 1 && ctx->d()->callData->args[0].isString()) {
+ if (ctx->argc() == 1 && ctx->args()[0].isString()) {
QLocale locale;
- QString dateString = ctx->d()->callData->args[0].stringValue()->toQString();
+ QString dateString = ctx->args()[0].stringValue()->toQString();
QDateTime dt = locale.toDateTime(dateString);
return QV4::Encode(engine->newDateObject(dt));
}
QV4::Scope scope(ctx);
- if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 3 || !isLocaleObject(ctx->d()->callData->args[0]))
+ if (ctx->argc() < 1 || ctx->argc() > 3 || !isLocaleObject(ctx->args()[0]))
V4THROW_ERROR("Locale: Date.fromLocaleString(): Invalid arguments");
- GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
+ GET_LOCALE_DATA_RESOURCE(ctx->args()[0]);
QLocale::FormatType enumFormat = QLocale::LongFormat;
QDateTime dt;
- 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();
+ QString dateString = ctx->args()[1].toQStringNoThrow();
+ if (ctx->argc() == 3) {
+ if (ctx->args()[2].isString()) {
+ QString format = ctx->args()[2].stringValue()->toQString();
dt = r->d()->locale.toDateTime(dateString, format);
- } else if (ctx->d()->callData->args[2].isNumber()) {
- quint32 intFormat = ctx->d()->callData->args[2].toNumber();
+ } else if (ctx->args()[2].isNumber()) {
+ quint32 intFormat = ctx->args()[2].toNumber();
QLocale::FormatType format = QLocale::FormatType(intFormat);
dt = r->d()->locale.toDateTime(dateString, format);
} else {
@@ -250,31 +250,31 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleTimeString(QV4::CallConte
{
QV4::ExecutionEngine * const engine = ctx->d()->engine;
- if (ctx->d()->callData->argc == 1 && ctx->d()->callData->args[0].isString()) {
+ if (ctx->argc() == 1 && ctx->args()[0].isString()) {
QLocale locale;
- QString timeString = ctx->d()->callData->args[0].stringValue()->toQString();
+ QString timeString = ctx->args()[0].stringValue()->toQString();
QTime time = locale.toTime(timeString);
QDateTime dt = QDateTime::currentDateTime();
dt.setTime(time);
return QV4::Encode(engine->newDateObject(dt));
}
- if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 3 || !isLocaleObject(ctx->d()->callData->args[0]))
+ if (ctx->argc() < 1 || ctx->argc() > 3 || !isLocaleObject(ctx->args()[0]))
V4THROW_ERROR("Locale: Date.fromLocaleTimeString(): Invalid arguments");
QV4::Scope scope(ctx);
- GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
+ GET_LOCALE_DATA_RESOURCE(ctx->args()[0]);
QLocale::FormatType enumFormat = QLocale::LongFormat;
QTime tm;
- 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();
+ QString dateString = ctx->args()[1].toQStringNoThrow();
+ if (ctx->argc() == 3) {
+ if (ctx->args()[2].isString()) {
+ QString format = ctx->args()[2].stringValue()->toQString();
tm = r->d()->locale.toTime(dateString, format);
- } else if (ctx->d()->callData->args[2].isNumber()) {
- quint32 intFormat = ctx->d()->callData->args[2].toNumber();
+ } else if (ctx->args()[2].isNumber()) {
+ quint32 intFormat = ctx->args()[2].toNumber();
QLocale::FormatType format = QLocale::FormatType(intFormat);
tm = r->d()->locale.toTime(dateString, format);
} else {
@@ -297,29 +297,29 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleDateString(QV4::CallConte
{
QV4::ExecutionEngine * const engine = ctx->d()->engine;
- if (ctx->d()->callData->argc == 1 && ctx->d()->callData->args[0].isString()) {
+ if (ctx->argc() == 1 && ctx->args()[0].isString()) {
QLocale locale;
- QString dateString = ctx->d()->callData->args[0].stringValue()->toQString();
+ QString dateString = ctx->args()[0].stringValue()->toQString();
QDate date = locale.toDate(dateString);
return QV4::Encode(engine->newDateObject(QDateTime(date)));
}
- if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 3 || !isLocaleObject(ctx->d()->callData->args[0]))
+ if (ctx->argc() < 1 || ctx->argc() > 3 || !isLocaleObject(ctx->args()[0]))
V4THROW_ERROR("Locale: Date.fromLocaleDateString(): Invalid arguments");
QV4::Scope scope(ctx);
- GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
+ GET_LOCALE_DATA_RESOURCE(ctx->args()[0]);
QLocale::FormatType enumFormat = QLocale::LongFormat;
QDate dt;
- 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();
+ QString dateString = ctx->args()[1].toQStringNoThrow();
+ if (ctx->argc() == 3) {
+ if (ctx->args()[2].isString()) {
+ QString format = ctx->args()[2].stringValue()->toQString();
dt = r->d()->locale.toDate(dateString, format);
- } else if (ctx->d()->callData->args[2].isNumber()) {
- quint32 intFormat = ctx->d()->callData->args[2].toNumber();
+ } else if (ctx->args()[2].isNumber()) {
+ quint32 intFormat = ctx->args()[2].toNumber();
QLocale::FormatType format = QLocale::FormatType(intFormat);
dt = r->d()->locale.toDate(dateString, format);
} else {
@@ -334,7 +334,7 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleDateString(QV4::CallConte
QV4::ReturnedValue QQmlDateExtension::method_timeZoneUpdated(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc != 0)
+ if (ctx->argc() != 0)
V4THROW_ERROR("Locale: Date.timeZoneUpdated(): Invalid arguments");
QV4::DatePrototype::timezoneUpdated();
@@ -354,37 +354,37 @@ void QQmlNumberExtension::registerExtension(QV4::ExecutionEngine *engine)
QV4::ReturnedValue QQmlNumberExtension::method_toLocaleString(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc > 3)
+ if (ctx->argc() > 3)
V4THROW_ERROR("Locale: Number.toLocaleString(): Invalid arguments");
- double number = ctx->d()->callData->thisObject.toNumber();
+ double number = ctx->thisObject().toNumber();
- if (ctx->d()->callData->argc == 0) {
+ if (ctx->argc() == 0) {
// Use QLocale for standard toLocaleString() function
QLocale locale;
return ctx->d()->engine->newString(locale.toString(number))->asReturnedValue();
}
- if (!isLocaleObject(ctx->d()->callData->args[0]))
+ if (!isLocaleObject(ctx->args()[0]))
return QV4::NumberPrototype::method_toLocaleString(ctx); // Use the default Number toLocaleString()
QV4::Scope scope(ctx);
- GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
+ GET_LOCALE_DATA_RESOURCE(ctx->args()[0]);
quint16 format = 'f';
- if (ctx->d()->callData->argc > 1) {
- if (!ctx->d()->callData->args[1].isString())
+ if (ctx->argc() > 1) {
+ if (!ctx->args()[1].isString())
V4THROW_ERROR("Locale: Number.toLocaleString(): Invalid arguments");
- QString fs = ctx->d()->callData->args[1].toQString();
+ QString fs = ctx->args()[1].toQString();
if (fs.length())
format = fs.at(0).unicode();
}
int prec = 2;
- if (ctx->d()->callData->argc > 2) {
- if (!ctx->d()->callData->args[2].isNumber())
+ if (ctx->argc() > 2) {
+ if (!ctx->args()[2].isNumber())
V4THROW_ERROR("Locale: Number.toLocaleString(): Invalid arguments");
- prec = ctx->d()->callData->args[2].toInt32();
+ prec = ctx->args()[2].toInt32();
}
return ctx->d()->engine->newString(r->d()->locale.toString(number, (char)format, prec))->asReturnedValue();
@@ -392,29 +392,29 @@ QV4::ReturnedValue QQmlNumberExtension::method_toLocaleString(QV4::CallContext *
QV4::ReturnedValue QQmlNumberExtension::method_toLocaleCurrencyString(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc > 2)
+ if (ctx->argc() > 2)
V4THROW_ERROR("Locale: Number.toLocaleCurrencyString(): Invalid arguments");
- double number = ctx->d()->callData->thisObject.toNumber();
+ double number = ctx->thisObject().toNumber();
- if (ctx->d()->callData->argc == 0) {
+ if (ctx->argc() == 0) {
// Use QLocale for standard toLocaleString() function
QLocale locale;
return ctx->d()->engine->newString(locale.toString(number))->asReturnedValue();
}
- if (!isLocaleObject(ctx->d()->callData->args[0]))
+ if (!isLocaleObject(ctx->args()[0]))
V4THROW_ERROR("Locale: Number.toLocaleCurrencyString(): Invalid arguments");
QV4::Scope scope(ctx);
- GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
+ GET_LOCALE_DATA_RESOURCE(ctx->args()[0]);
QString symbol;
- if (ctx->d()->callData->argc > 1) {
- if (!ctx->d()->callData->args[1].isString())
+ if (ctx->argc() > 1) {
+ if (!ctx->args()[1].isString())
V4THROW_ERROR("Locale: Number.toLocaleString(): Invalid arguments");
- symbol = ctx->d()->callData->args[1].toQStringNoThrow();
+ symbol = ctx->args()[1].toQStringNoThrow();
}
return ctx->d()->engine->newString(r->d()->locale.toCurrencyString(number, symbol))->asReturnedValue();
@@ -422,7 +422,7 @@ QV4::ReturnedValue QQmlNumberExtension::method_toLocaleCurrencyString(QV4::CallC
QV4::ReturnedValue QQmlNumberExtension::method_fromLocaleString(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 2)
+ if (ctx->argc() < 1 || ctx->argc() > 2)
V4THROW_ERROR("Locale: Number.fromLocaleString(): Invalid arguments");
int numberIdx = 0;
@@ -430,17 +430,17 @@ QV4::ReturnedValue QQmlNumberExtension::method_fromLocaleString(QV4::CallContext
QV4::Scope scope(ctx);
- if (ctx->d()->callData->argc == 2) {
- if (!isLocaleObject(ctx->d()->callData->args[0]))
+ if (ctx->argc() == 2) {
+ if (!isLocaleObject(ctx->args()[0]))
V4THROW_ERROR("Locale: Number.fromLocaleString(): Invalid arguments");
- GET_LOCALE_DATA_RESOURCE(ctx->d()->callData->args[0]);
+ GET_LOCALE_DATA_RESOURCE(ctx->args()[0]);
locale = r->d()->locale;
numberIdx = 1;
}
- QString ns = ctx->d()->callData->args[numberIdx].toQString();
+ QString ns = ctx->args()[numberIdx].toQString();
if (!ns.length())
return QV4::Encode(Q_QNAN);
@@ -531,12 +531,12 @@ QV4::ReturnedValue QQmlLocaleData::method_currencySymbol(QV4::CallContext *ctx)
if (!locale)
return QV4::Encode::undefined();
- if (ctx->d()->callData->argc > 1)
+ if (ctx->argc() > 1)
V4THROW_ERROR("Locale: currencySymbol(): Invalid arguments");
QLocale::CurrencySymbolFormat format = QLocale::CurrencySymbol;
- if (ctx->d()->callData->argc == 1) {
- quint32 intFormat = ctx->d()->callData->args[0].toNumber();
+ if (ctx->argc() == 1) {
+ quint32 intFormat = ctx->args()[0].toNumber();
format = QLocale::CurrencySymbolFormat(intFormat);
}
@@ -548,11 +548,11 @@ QV4::ReturnedValue QQmlLocaleData::method_ ##FUNC (QV4::CallContext *ctx) { \
QLocale *locale = getThisLocale(ctx); \
if (!locale) \
return QV4::Encode::undefined(); \
- if (ctx->d()->callData->argc > 1) \
+ if (ctx->argc() > 1) \
V4THROW_ERROR("Locale: " #FUNC "(): Invalid arguments"); \
QLocale::FormatType format = QLocale::LongFormat;\
- if (ctx->d()->callData->argc == 1) { \
- quint32 intFormat = ctx->d()->callData->args[0].toUInt32(); \
+ if (ctx->argc() == 1) { \
+ quint32 intFormat = ctx->args()[0].toUInt32(); \
format = QLocale::FormatType(intFormat); \
} \
return ctx->engine()->newString(locale-> FUNC (format))->asReturnedValue(); \
@@ -568,16 +568,16 @@ QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::CallContext *ctx) {
QLocale *locale = getThisLocale(ctx); \
if (!locale) \
return QV4::Encode::undefined(); \
- if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 2) \
+ if (ctx->argc() < 1 || ctx->argc() > 2) \
V4THROW_ERROR("Locale: " #VARIABLE "(): Invalid arguments"); \
QLocale::FormatType enumFormat = QLocale::LongFormat; \
- int idx = ctx->d()->callData->args[0].toInt32() + 1; \
+ int idx = ctx->args()[0].toInt32() + 1; \
if (idx < 1 || idx > 12) \
V4THROW_ERROR("Locale: Invalid month"); \
QString name; \
- if (ctx->d()->callData->argc == 2) { \
- if (ctx->d()->callData->args[1].isNumber()) { \
- quint32 intFormat = ctx->d()->callData->args[1].toUInt32(); \
+ if (ctx->argc() == 2) { \
+ if (ctx->args()[1].isNumber()) { \
+ quint32 intFormat = ctx->args()[1].toUInt32(); \
QLocale::FormatType format = QLocale::FormatType(intFormat); \
name = locale-> VARIABLE(idx, format); \
} else { \
@@ -595,17 +595,17 @@ QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::CallContext *ctx) {
QLocale *locale = getThisLocale(ctx); \
if (!locale) \
return QV4::Encode::undefined(); \
- if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 2) \
+ if (ctx->argc() < 1 || ctx->argc() > 2) \
V4THROW_ERROR("Locale: " #VARIABLE "(): Invalid arguments"); \
QLocale::FormatType enumFormat = QLocale::LongFormat; \
- int idx = ctx->d()->callData->args[0].toInt32(); \
+ int idx = ctx->args()[0].toInt32(); \
if (idx < 0 || idx > 7) \
V4THROW_ERROR("Locale: Invalid day"); \
if (idx == 0) idx = 7; \
QString name; \
- if (ctx->d()->callData->argc == 2) { \
- if (ctx->d()->callData->args[1].isNumber()) { \
- quint32 intFormat = ctx->d()->callData->args[1].toUInt32(); \
+ if (ctx->argc() == 2) { \
+ if (ctx->args()[1].isNumber()) { \
+ quint32 intFormat = ctx->args()[1].toUInt32(); \
QLocale::FormatType format = QLocale::FormatType(intFormat); \
name = locale-> VARIABLE(idx, format); \
} else { \
@@ -820,14 +820,14 @@ void QQmlLocale::registerStringLocaleCompare(QV4::ExecutionEngine *engine)
QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc != 1 || (!ctx->d()->callData->args[0].isString() && !ctx->d()->callData->args[0].asStringObject()))
+ if (ctx->argc() != 1 || (!ctx->args()[0].isString() && !ctx->args()[0].asStringObject()))
return QV4::StringPrototype::method_localeCompare(ctx);
- if (!ctx->d()->callData->thisObject.isString() && !ctx->d()->callData->thisObject.asStringObject())
+ if (!ctx->thisObject().isString() && !ctx->thisObject().asStringObject())
return QV4::StringPrototype::method_localeCompare(ctx);
- QString thisString = ctx->d()->callData->thisObject.toQStringNoThrow();
- QString thatString = ctx->d()->callData->args[0].toQStringNoThrow();
+ QString thisString = ctx->thisObject().toQStringNoThrow();
+ QString thatString = ctx->args()[0].toQStringNoThrow();
return QV4::Encode(QString::localeAwareCompare(thisString, thatString));
}
diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h
index 1b9afd1c81..169eab4dde 100644
--- a/src/qml/qml/qqmllocale_p.h
+++ b/src/qml/qml/qqmllocale_p.h
@@ -137,7 +137,7 @@ struct QQmlLocaleData : public QV4::Object
V4_NEEDS_DESTROY
static QLocale *getThisLocale(QV4::CallContext *ctx) {
- QV4::Object *o = ctx->d()->callData->thisObject.asObject();
+ QV4::Object *o = ctx->thisObject().asObject();
QQmlLocaleData *thisObject = o ? o->as<QQmlLocaleData>() : 0;
if (!thisObject) {
ctx->engine()->throwTypeError();
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index b80472559b..271b986a34 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -250,7 +250,7 @@ bool QQmlValueTypeWrapper::isEqual(const QVariant& value)
ReturnedValue QQmlValueTypeWrapper::method_toString(CallContext *ctx)
{
- Object *o = ctx->d()->callData->thisObject.asObject();
+ Object *o = ctx->thisObject().asObject();
if (!o)
return ctx->engine()->throwTypeError();
QQmlValueTypeWrapper *w = o->as<QQmlValueTypeWrapper>();
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index 527e9c8446..e05d83364d 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -418,7 +418,7 @@ void NodeImpl::release()
ReturnedValue NodePrototype::method_get_nodeName(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r)
return ctx->engine()->throwTypeError();
@@ -443,7 +443,7 @@ ReturnedValue NodePrototype::method_get_nodeName(CallContext *ctx)
ReturnedValue NodePrototype::method_get_nodeValue(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r)
return ctx->engine()->throwTypeError();
@@ -462,7 +462,7 @@ ReturnedValue NodePrototype::method_get_nodeValue(CallContext *ctx)
ReturnedValue NodePrototype::method_get_nodeType(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r)
return ctx->engine()->throwTypeError();
@@ -472,7 +472,7 @@ ReturnedValue NodePrototype::method_get_nodeType(CallContext *ctx)
ReturnedValue NodePrototype::method_get_parentNode(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r)
return ctx->engine()->throwTypeError();
@@ -485,7 +485,7 @@ ReturnedValue NodePrototype::method_get_parentNode(CallContext *ctx)
ReturnedValue NodePrototype::method_get_childNodes(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r)
return ctx->engine()->throwTypeError();
@@ -495,7 +495,7 @@ ReturnedValue NodePrototype::method_get_childNodes(CallContext *ctx)
ReturnedValue NodePrototype::method_get_firstChild(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r)
return ctx->engine()->throwTypeError();
@@ -508,7 +508,7 @@ ReturnedValue NodePrototype::method_get_firstChild(CallContext *ctx)
ReturnedValue NodePrototype::method_get_lastChild(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r)
return ctx->engine()->throwTypeError();
@@ -521,7 +521,7 @@ ReturnedValue NodePrototype::method_get_lastChild(CallContext *ctx)
ReturnedValue NodePrototype::method_get_previousSibling(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r)
return ctx->engine()->throwTypeError();
@@ -543,7 +543,7 @@ ReturnedValue NodePrototype::method_get_previousSibling(CallContext *ctx)
ReturnedValue NodePrototype::method_get_nextSibling(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r)
return ctx->engine()->throwTypeError();
@@ -565,7 +565,7 @@ ReturnedValue NodePrototype::method_get_nextSibling(CallContext *ctx)
ReturnedValue NodePrototype::method_get_attributes(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r)
return ctx->engine()->throwTypeError();
@@ -656,7 +656,7 @@ ReturnedValue Attr::prototype(ExecutionEngine *engine)
ReturnedValue Attr::method_name(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r)
return Encode::undefined();
@@ -666,7 +666,7 @@ ReturnedValue Attr::method_name(CallContext *ctx)
ReturnedValue Attr::method_value(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r)
return Encode::undefined();
@@ -676,7 +676,7 @@ ReturnedValue Attr::method_value(CallContext *ctx)
ReturnedValue Attr::method_ownerElement(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r)
return Encode::undefined();
@@ -686,7 +686,7 @@ ReturnedValue Attr::method_ownerElement(CallContext *ctx)
ReturnedValue CharacterData::method_length(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r)
return Encode::undefined();
@@ -712,7 +712,7 @@ ReturnedValue CharacterData::prototype(ExecutionEngine *v4)
ReturnedValue Text::method_isElementContentWhitespace(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r) return Encode::undefined();
return Encode(r->d()->d->data.trimmed().isEmpty());
@@ -721,7 +721,7 @@ ReturnedValue Text::method_isElementContentWhitespace(CallContext *ctx)
ReturnedValue Text::method_wholeText(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r)
return Encode::undefined();
@@ -956,7 +956,7 @@ ReturnedValue NodeList::create(ExecutionEngine *v4, NodeImpl *data)
ReturnedValue Document::method_documentElement(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r || r->d()->d->type != NodeImpl::Document)
return Encode::undefined();
@@ -966,7 +966,7 @@ ReturnedValue Document::method_documentElement(CallContext *ctx)
ReturnedValue Document::method_xmlStandalone(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r || r->d()->d->type != NodeImpl::Document)
return Encode::undefined();
@@ -976,7 +976,7 @@ ReturnedValue Document::method_xmlStandalone(CallContext *ctx)
ReturnedValue Document::method_xmlVersion(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r || r->d()->d->type != NodeImpl::Document)
return Encode::undefined();
@@ -986,7 +986,7 @@ ReturnedValue Document::method_xmlVersion(CallContext *ctx)
ReturnedValue Document::method_xmlEncoding(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<Node> r(scope, ctx->d()->callData->thisObject.as<Node>());
+ Scoped<Node> r(scope, ctx->thisObject().as<Node>());
if (!r || r->d()->d->type != NodeImpl::Document)
return Encode::undefined();
@@ -1704,16 +1704,16 @@ void QQmlXMLHttpRequestCtor::setupProto()
ReturnedValue QQmlXMLHttpRequestCtor::method_open(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->d()->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
+ Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->thisObject().as<QQmlXMLHttpRequestWrapper>());
if (!w)
V4THROW_REFERENCE("Not an XMLHttpRequest object");
QQmlXMLHttpRequest *r = w->d()->request;
- if (ctx->d()->callData->argc < 2 || ctx->d()->callData->argc > 5)
+ if (ctx->argc() < 2 || ctx->argc() > 5)
V4THROW_DOM(DOMEXCEPTION_SYNTAX_ERR, "Incorrect argument count");
// Argument 0 - Method
- QString method = ctx->d()->callData->args[0].toQStringNoThrow().toUpper();
+ QString method = ctx->args()[0].toQStringNoThrow().toUpper();
if (method != QLatin1String("GET") &&
method != QLatin1String("PUT") &&
method != QLatin1String("HEAD") &&
@@ -1723,23 +1723,23 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_open(CallContext *ctx)
V4THROW_DOM(DOMEXCEPTION_SYNTAX_ERR, "Unsupported HTTP method type");
// Argument 1 - URL
- QUrl url = QUrl(ctx->d()->callData->args[1].toQStringNoThrow());
+ QUrl url = QUrl(ctx->args()[1].toQStringNoThrow());
if (url.isRelative())
url = scope.engine->v8Engine->callingContext()->resolvedUrl(url);
bool async = true;
// Argument 2 - async (optional)
- if (ctx->d()->callData->argc > 2) {
- async = ctx->d()->callData->args[2].booleanValue();
+ if (ctx->argc() > 2) {
+ async = ctx->args()[2].booleanValue();
}
// Argument 3/4 - user/pass (optional)
QString username, password;
- if (ctx->d()->callData->argc > 3)
- username = ctx->d()->callData->args[3].toQStringNoThrow();
- if (ctx->d()->callData->argc > 4)
- password = ctx->d()->callData->args[4].toQStringNoThrow();
+ if (ctx->argc() > 3)
+ username = ctx->args()[3].toQStringNoThrow();
+ if (ctx->argc() > 4)
+ password = ctx->args()[4].toQStringNoThrow();
// Clear the fragment (if any)
url.setFragment(QString());
@@ -1748,26 +1748,26 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_open(CallContext *ctx)
if (!username.isNull()) url.setUserName(username);
if (!password.isNull()) url.setPassword(password);
- ScopedValue meObject(scope, constructMeObject(ctx->d()->callData->thisObject, scope.engine));
+ ScopedValue meObject(scope, constructMeObject(ctx->thisObject(), scope.engine));
return r->open(meObject, method, url, async ? QQmlXMLHttpRequest::AsynchronousLoad : QQmlXMLHttpRequest::SynchronousLoad);
}
ReturnedValue QQmlXMLHttpRequestCtor::method_setRequestHeader(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->d()->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
+ Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->thisObject().as<QQmlXMLHttpRequestWrapper>());
if (!w)
V4THROW_REFERENCE("Not an XMLHttpRequest object");
QQmlXMLHttpRequest *r = w->d()->request;
- if (ctx->d()->callData->argc != 2)
+ if (ctx->argc() != 2)
V4THROW_DOM(DOMEXCEPTION_SYNTAX_ERR, "Incorrect argument count");
if (r->readyState() != QQmlXMLHttpRequest::Opened || r->sendFlag())
V4THROW_DOM(DOMEXCEPTION_INVALID_STATE_ERR, "Invalid state");
- QString name = ctx->d()->callData->args[0].toQStringNoThrow();
- QString value = ctx->d()->callData->args[1].toQStringNoThrow();
+ QString name = ctx->args()[0].toQStringNoThrow();
+ QString value = ctx->args()[1].toQStringNoThrow();
// ### Check that name and value are well formed
@@ -1802,7 +1802,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_setRequestHeader(CallContext *ctx)
ReturnedValue QQmlXMLHttpRequestCtor::method_send(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->d()->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
+ Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->thisObject().as<QQmlXMLHttpRequestWrapper>());
if (!w)
V4THROW_REFERENCE("Not an XMLHttpRequest object");
QQmlXMLHttpRequest *r = w->d()->request;
@@ -1812,34 +1812,34 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_send(CallContext *ctx)
V4THROW_DOM(DOMEXCEPTION_INVALID_STATE_ERR, "Invalid state");
QByteArray data;
- if (ctx->d()->callData->argc > 0)
- data = ctx->d()->callData->args[0].toQStringNoThrow().toUtf8();
+ if (ctx->argc() > 0)
+ data = ctx->args()[0].toQStringNoThrow().toUtf8();
- ScopedValue meObject(scope, constructMeObject(ctx->d()->callData->thisObject, scope.engine));
+ ScopedValue meObject(scope, constructMeObject(ctx->thisObject(), scope.engine));
return r->send(meObject, data);
}
ReturnedValue QQmlXMLHttpRequestCtor::method_abort(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->d()->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
+ Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->thisObject().as<QQmlXMLHttpRequestWrapper>());
if (!w)
V4THROW_REFERENCE("Not an XMLHttpRequest object");
QQmlXMLHttpRequest *r = w->d()->request;
- ScopedValue meObject(scope, constructMeObject(ctx->d()->callData->thisObject, scope.engine));
+ ScopedValue meObject(scope, constructMeObject(ctx->thisObject(), scope.engine));
return r->abort(meObject);
}
ReturnedValue QQmlXMLHttpRequestCtor::method_getResponseHeader(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->d()->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
+ Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->thisObject().as<QQmlXMLHttpRequestWrapper>());
if (!w)
V4THROW_REFERENCE("Not an XMLHttpRequest object");
QQmlXMLHttpRequest *r = w->d()->request;
- if (ctx->d()->callData->argc != 1)
+ if (ctx->argc() != 1)
V4THROW_DOM(DOMEXCEPTION_SYNTAX_ERR, "Incorrect argument count");
if (r->readyState() != QQmlXMLHttpRequest::Loading &&
@@ -1847,18 +1847,18 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_getResponseHeader(CallContext *ctx)
r->readyState() != QQmlXMLHttpRequest::HeadersReceived)
V4THROW_DOM(DOMEXCEPTION_INVALID_STATE_ERR, "Invalid state");
- return QV4::Encode(scope.engine->newString(r->header(ctx->d()->callData->args[0].toQStringNoThrow())));
+ return QV4::Encode(scope.engine->newString(r->header(ctx->args()[0].toQStringNoThrow())));
}
ReturnedValue QQmlXMLHttpRequestCtor::method_getAllResponseHeaders(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->d()->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
+ Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->thisObject().as<QQmlXMLHttpRequestWrapper>());
if (!w)
V4THROW_REFERENCE("Not an XMLHttpRequest object");
QQmlXMLHttpRequest *r = w->d()->request;
- if (ctx->d()->callData->argc != 0)
+ if (ctx->argc() != 0)
V4THROW_DOM(DOMEXCEPTION_SYNTAX_ERR, "Incorrect argument count");
if (r->readyState() != QQmlXMLHttpRequest::Loading &&
@@ -1873,7 +1873,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_getAllResponseHeaders(CallContext *
ReturnedValue QQmlXMLHttpRequestCtor::method_get_readyState(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->d()->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
+ Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->thisObject().as<QQmlXMLHttpRequestWrapper>());
if (!w)
V4THROW_REFERENCE("Not an XMLHttpRequest object");
QQmlXMLHttpRequest *r = w->d()->request;
@@ -1884,7 +1884,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_get_readyState(CallContext *ctx)
ReturnedValue QQmlXMLHttpRequestCtor::method_get_status(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->d()->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
+ Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->thisObject().as<QQmlXMLHttpRequestWrapper>());
if (!w)
V4THROW_REFERENCE("Not an XMLHttpRequest object");
QQmlXMLHttpRequest *r = w->d()->request;
@@ -1902,7 +1902,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_get_status(CallContext *ctx)
ReturnedValue QQmlXMLHttpRequestCtor::method_get_statusText(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->d()->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
+ Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->thisObject().as<QQmlXMLHttpRequestWrapper>());
if (!w)
V4THROW_REFERENCE("Not an XMLHttpRequest object");
QQmlXMLHttpRequest *r = w->d()->request;
@@ -1920,7 +1920,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_get_statusText(CallContext *ctx)
ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseText(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->d()->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
+ Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->thisObject().as<QQmlXMLHttpRequestWrapper>());
if (!w)
V4THROW_REFERENCE("Not an XMLHttpRequest object");
QQmlXMLHttpRequest *r = w->d()->request;
@@ -1935,7 +1935,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseText(CallContext *ctx)
ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseXML(CallContext *ctx)
{
Scope scope(ctx);
- Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->d()->callData->thisObject.as<QQmlXMLHttpRequestWrapper>());
+ Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->thisObject().as<QQmlXMLHttpRequestWrapper>());
if (!w)
V4THROW_REFERENCE("Not an XMLHttpRequest object");
QQmlXMLHttpRequest *r = w->d()->request;
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 0878063f2e..cd1387b5b4 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -150,10 +150,10 @@ Returns true if \c object is a valid reference to a Qt or QML object, otherwise
*/
ReturnedValue QtObject::method_isQtObject(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc == 0)
+ if (ctx->argc() == 0)
return QV4::Encode(false);
- return QV4::Encode(ctx->d()->callData->args[0].as<QV4::QObjectWrapper>() != 0);
+ return QV4::Encode(ctx->args()[0].as<QV4::QObjectWrapper>() != 0);
}
/*!
@@ -164,14 +164,14 @@ All components should be in the range 0-1 inclusive.
*/
ReturnedValue QtObject::method_rgba(QV4::CallContext *ctx)
{
- int argCount = ctx->d()->callData->argc;
+ int argCount = ctx->argc();
if (argCount < 3 || argCount > 4)
V4THROW_ERROR("Qt.rgba(): Invalid arguments");
- double r = ctx->d()->callData->args[0].toNumber();
- double g = ctx->d()->callData->args[1].toNumber();
- double b = ctx->d()->callData->args[2].toNumber();
- double a = (argCount == 4) ? ctx->d()->callData->args[3].toNumber() : 1;
+ double r = ctx->args()[0].toNumber();
+ double g = ctx->args()[1].toNumber();
+ double b = ctx->args()[2].toNumber();
+ double a = (argCount == 4) ? ctx->args()[3].toNumber() : 1;
if (r < 0.0) r=0.0;
if (r > 1.0) r=1.0;
@@ -193,14 +193,14 @@ All components should be in the range 0-1 inclusive.
*/
ReturnedValue QtObject::method_hsla(QV4::CallContext *ctx)
{
- int argCount = ctx->d()->callData->argc;
+ int argCount = ctx->argc();
if (argCount < 3 || argCount > 4)
V4THROW_ERROR("Qt.hsla(): Invalid arguments");
- double h = ctx->d()->callData->args[0].toNumber();
- double s = ctx->d()->callData->args[1].toNumber();
- double l = ctx->d()->callData->args[2].toNumber();
- double a = (argCount == 4) ? ctx->d()->callData->args[3].toNumber() : 1;
+ double h = ctx->args()[0].toNumber();
+ double s = ctx->args()[1].toNumber();
+ double l = ctx->args()[2].toNumber();
+ double a = (argCount == 4) ? ctx->args()[3].toNumber() : 1;
if (h < 0.0) h=0.0;
if (h > 1.0) h=1.0;
@@ -224,12 +224,12 @@ basic type.
*/
ReturnedValue QtObject::method_colorEqual(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc != 2)
+ if (ctx->argc() != 2)
V4THROW_ERROR("Qt.colorEqual(): Invalid arguments");
bool ok = false;
- QVariant lhs = ctx->d()->engine->toVariant(ctx->d()->callData->args[0], -1);
+ QVariant lhs = ctx->d()->engine->toVariant(ctx->args()[0], -1);
if (lhs.userType() == QVariant::String) {
lhs = QQmlStringConverters::colorFromString(lhs.toString(), &ok);
if (!ok) {
@@ -239,7 +239,7 @@ ReturnedValue QtObject::method_colorEqual(QV4::CallContext *ctx)
V4THROW_ERROR("Qt.colorEqual(): Invalid arguments");
}
- QVariant rhs = ctx->engine()->toVariant(ctx->d()->callData->args[1], -1);
+ QVariant rhs = ctx->engine()->toVariant(ctx->args()[1], -1);
if (rhs.userType() == QVariant::String) {
rhs = QQmlStringConverters::colorFromString(rhs.toString(), &ok);
if (!ok) {
@@ -262,13 +262,13 @@ The returned object has \c x, \c y, \c width and \c height attributes with the g
*/
ReturnedValue QtObject::method_rect(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc != 4)
+ if (ctx->argc() != 4)
V4THROW_ERROR("Qt.rect(): Invalid arguments");
- double x = ctx->d()->callData->args[0].toNumber();
- double y = ctx->d()->callData->args[1].toNumber();
- double w = ctx->d()->callData->args[2].toNumber();
- double h = ctx->d()->callData->args[3].toNumber();
+ double x = ctx->args()[0].toNumber();
+ double y = ctx->args()[1].toNumber();
+ double w = ctx->args()[2].toNumber();
+ double h = ctx->args()[3].toNumber();
return ctx->engine()->fromVariant(QVariant::fromValue(QRectF(x, y, w, h)));
}
@@ -279,11 +279,11 @@ Returns a Point with the specified \c x and \c y coordinates.
*/
ReturnedValue QtObject::method_point(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc != 2)
+ if (ctx->argc() != 2)
V4THROW_ERROR("Qt.point(): Invalid arguments");
- double x = ctx->d()->callData->args[0].toNumber();
- double y = ctx->d()->callData->args[1].toNumber();
+ double x = ctx->args()[0].toNumber();
+ double y = ctx->args()[1].toNumber();
return ctx->engine()->fromVariant(QVariant::fromValue(QPointF(x, y)));
}
@@ -294,11 +294,11 @@ Returns a Size with the specified \c width and \c height.
*/
ReturnedValue QtObject::method_size(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc != 2)
+ if (ctx->argc() != 2)
V4THROW_ERROR("Qt.size(): Invalid arguments");
- double w = ctx->d()->callData->args[0].toNumber();
- double h = ctx->d()->callData->args[1].toNumber();
+ double w = ctx->args()[0].toNumber();
+ double h = ctx->args()[1].toNumber();
return ctx->engine()->fromVariant(QVariant::fromValue(QSizeF(w, h)));
}
@@ -313,12 +313,12 @@ Invalid keys will be ignored.
*/
ReturnedValue QtObject::method_font(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc != 1 || !ctx->d()->callData->args[0].isObject())
+ if (ctx->argc() != 1 || !ctx->args()[0].isObject())
V4THROW_ERROR("Qt.font(): Invalid arguments");
QV4::ExecutionEngine *v4 = ctx->d()->engine;
bool ok = false;
- QVariant v = QQml_valueTypeProvider()->createVariantFromJsObject(QMetaType::QFont, QQmlV4Handle(ctx->d()->callData->args[0]), v4, &ok);
+ QVariant v = QQml_valueTypeProvider()->createVariantFromJsObject(QMetaType::QFont, QQmlV4Handle(ctx->args()[0]), v4, &ok);
if (!ok)
V4THROW_ERROR("Qt.font(): Invalid argument: no valid font subproperties specified");
return ctx->engine()->fromVariant(v);
@@ -332,12 +332,12 @@ Returns a Vector2D with the specified \c x and \c y.
*/
ReturnedValue QtObject::method_vector2d(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc != 2)
+ if (ctx->argc() != 2)
V4THROW_ERROR("Qt.vector2d(): Invalid arguments");
float xy[3]; // qvector2d uses float internally
- xy[0] = ctx->d()->callData->args[0].toNumber();
- xy[1] = ctx->d()->callData->args[1].toNumber();
+ xy[0] = ctx->args()[0].toNumber();
+ xy[1] = ctx->args()[1].toNumber();
const void *params[] = { xy };
return ctx->engine()->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QVector2D, 1, params));
@@ -349,13 +349,13 @@ Returns a Vector3D with the specified \c x, \c y and \c z.
*/
ReturnedValue QtObject::method_vector3d(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc != 3)
+ if (ctx->argc() != 3)
V4THROW_ERROR("Qt.vector3d(): Invalid arguments");
float xyz[3]; // qvector3d uses float internally
- xyz[0] = ctx->d()->callData->args[0].toNumber();
- xyz[1] = ctx->d()->callData->args[1].toNumber();
- xyz[2] = ctx->d()->callData->args[2].toNumber();
+ xyz[0] = ctx->args()[0].toNumber();
+ xyz[1] = ctx->args()[1].toNumber();
+ xyz[2] = ctx->args()[2].toNumber();
const void *params[] = { xyz };
return ctx->engine()->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QVector3D, 1, params));
@@ -367,14 +367,14 @@ Returns a Vector4D with the specified \c x, \c y, \c z and \c w.
*/
ReturnedValue QtObject::method_vector4d(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc != 4)
+ if (ctx->argc() != 4)
V4THROW_ERROR("Qt.vector4d(): Invalid arguments");
float xyzw[4]; // qvector4d uses float internally
- xyzw[0] = ctx->d()->callData->args[0].toNumber();
- xyzw[1] = ctx->d()->callData->args[1].toNumber();
- xyzw[2] = ctx->d()->callData->args[2].toNumber();
- xyzw[3] = ctx->d()->callData->args[3].toNumber();
+ xyzw[0] = ctx->args()[0].toNumber();
+ xyzw[1] = ctx->args()[1].toNumber();
+ xyzw[2] = ctx->args()[2].toNumber();
+ xyzw[3] = ctx->args()[3].toNumber();
const void *params[] = { xyzw };
return ctx->engine()->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QVector4D, 1, params));
@@ -386,14 +386,14 @@ Returns a Quaternion with the specified \c scalar, \c x, \c y, and \c z.
*/
ReturnedValue QtObject::method_quaternion(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc != 4)
+ if (ctx->argc() != 4)
V4THROW_ERROR("Qt.quaternion(): Invalid arguments");
qreal sxyz[4]; // qquaternion uses qreal internally
- sxyz[0] = ctx->d()->callData->args[0].toNumber();
- sxyz[1] = ctx->d()->callData->args[1].toNumber();
- sxyz[2] = ctx->d()->callData->args[2].toNumber();
- sxyz[3] = ctx->d()->callData->args[3].toNumber();
+ sxyz[0] = ctx->args()[0].toNumber();
+ sxyz[1] = ctx->args()[1].toNumber();
+ sxyz[2] = ctx->args()[2].toNumber();
+ sxyz[3] = ctx->args()[3].toNumber();
const void *params[] = { sxyz };
return ctx->engine()->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QQuaternion, 1, params));
@@ -410,34 +410,34 @@ ReturnedValue QtObject::method_matrix4x4(QV4::CallContext *ctx)
{
QV4::ExecutionEngine *v4 = ctx->d()->engine;
- if (ctx->d()->callData->argc == 1 && ctx->d()->callData->args[0].isObject()) {
+ if (ctx->argc() == 1 && ctx->args()[0].isObject()) {
bool ok = false;
- QVariant v = QQml_valueTypeProvider()->createVariantFromJsObject(QMetaType::QMatrix4x4, QQmlV4Handle(ctx->d()->callData->args[0]), v4, &ok);
+ QVariant v = QQml_valueTypeProvider()->createVariantFromJsObject(QMetaType::QMatrix4x4, QQmlV4Handle(ctx->args()[0]), v4, &ok);
if (!ok)
V4THROW_ERROR("Qt.matrix4x4(): Invalid argument: not a valid matrix4x4 values array");
return ctx->engine()->fromVariant(v);
}
- if (ctx->d()->callData->argc != 16)
+ if (ctx->argc() != 16)
V4THROW_ERROR("Qt.matrix4x4(): Invalid arguments");
qreal vals[16]; // qmatrix4x4 uses qreal internally
- vals[0] = ctx->d()->callData->args[0].toNumber();
- vals[1] = ctx->d()->callData->args[1].toNumber();
- vals[2] = ctx->d()->callData->args[2].toNumber();
- vals[3] = ctx->d()->callData->args[3].toNumber();
- vals[4] = ctx->d()->callData->args[4].toNumber();
- vals[5] = ctx->d()->callData->args[5].toNumber();
- vals[6] = ctx->d()->callData->args[6].toNumber();
- vals[7] = ctx->d()->callData->args[7].toNumber();
- vals[8] = ctx->d()->callData->args[8].toNumber();
- vals[9] = ctx->d()->callData->args[9].toNumber();
- vals[10] = ctx->d()->callData->args[10].toNumber();
- vals[11] = ctx->d()->callData->args[11].toNumber();
- vals[12] = ctx->d()->callData->args[12].toNumber();
- vals[13] = ctx->d()->callData->args[13].toNumber();
- vals[14] = ctx->d()->callData->args[14].toNumber();
- vals[15] = ctx->d()->callData->args[15].toNumber();
+ vals[0] = ctx->args()[0].toNumber();
+ vals[1] = ctx->args()[1].toNumber();
+ vals[2] = ctx->args()[2].toNumber();
+ vals[3] = ctx->args()[3].toNumber();
+ vals[4] = ctx->args()[4].toNumber();
+ vals[5] = ctx->args()[5].toNumber();
+ vals[6] = ctx->args()[6].toNumber();
+ vals[7] = ctx->args()[7].toNumber();
+ vals[8] = ctx->args()[8].toNumber();
+ vals[9] = ctx->args()[9].toNumber();
+ vals[10] = ctx->args()[10].toNumber();
+ vals[11] = ctx->args()[11].toNumber();
+ vals[12] = ctx->args()[12].toNumber();
+ vals[13] = ctx->args()[13].toNumber();
+ vals[14] = ctx->args()[14].toNumber();
+ vals[15] = ctx->args()[15].toNumber();
const void *params[] = { vals };
return ctx->engine()->fromVariant(QQml_valueTypeProvider()->createValueType(QMetaType::QMatrix4x4, 1, params));
@@ -459,10 +459,10 @@ If \c factor is not supplied, returns a color 50% lighter than \c baseColor (fac
*/
ReturnedValue QtObject::method_lighter(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc != 1 && ctx->d()->callData->argc != 2)
+ if (ctx->argc() != 1 && ctx->argc() != 2)
V4THROW_ERROR("Qt.lighter(): Invalid arguments");
- QVariant v = ctx->engine()->toVariant(ctx->d()->callData->args[0], -1);
+ QVariant v = ctx->engine()->toVariant(ctx->args()[0], -1);
if (v.userType() == QVariant::String) {
bool ok = false;
v = QQmlStringConverters::colorFromString(v.toString(), &ok);
@@ -474,8 +474,8 @@ ReturnedValue QtObject::method_lighter(QV4::CallContext *ctx)
}
qreal factor = 1.5;
- if (ctx->d()->callData->argc == 2)
- factor = ctx->d()->callData->args[1].toNumber();
+ if (ctx->argc() == 2)
+ factor = ctx->args()[1].toNumber();
return ctx->engine()->fromVariant(QQml_colorProvider()->lighter(v, factor));
}
@@ -497,10 +497,10 @@ If \c factor is not supplied, returns a color 50% darker than \c baseColor (fact
*/
ReturnedValue QtObject::method_darker(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc != 1 && ctx->d()->callData->argc != 2)
+ if (ctx->argc() != 1 && ctx->argc() != 2)
V4THROW_ERROR("Qt.darker(): Invalid arguments");
- QVariant v = ctx->engine()->toVariant(ctx->d()->callData->args[0], -1);
+ QVariant v = ctx->engine()->toVariant(ctx->args()[0], -1);
if (v.userType() == QVariant::String) {
bool ok = false;
v = QQmlStringConverters::colorFromString(v.toString(), &ok);
@@ -512,8 +512,8 @@ ReturnedValue QtObject::method_darker(QV4::CallContext *ctx)
}
qreal factor = 2.0;
- if (ctx->d()->callData->argc == 2)
- factor = ctx->d()->callData->args[1].toNumber();
+ if (ctx->argc() == 2)
+ factor = ctx->args()[1].toNumber();
return ctx->engine()->fromVariant(QQml_colorProvider()->darker(v, factor));
}
@@ -544,11 +544,11 @@ ReturnedValue QtObject::method_darker(QV4::CallContext *ctx)
*/
ReturnedValue QtObject::method_tint(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc != 2)
+ if (ctx->argc() != 2)
V4THROW_ERROR("Qt.tint(): Invalid arguments");
// base color
- QVariant v1 = ctx->engine()->toVariant(ctx->d()->callData->args[0], -1);
+ QVariant v1 = ctx->engine()->toVariant(ctx->args()[0], -1);
if (v1.userType() == QVariant::String) {
bool ok = false;
v1 = QQmlStringConverters::colorFromString(v1.toString(), &ok);
@@ -560,7 +560,7 @@ ReturnedValue QtObject::method_tint(QV4::CallContext *ctx)
}
// tint color
- QVariant v2 = ctx->engine()->toVariant(ctx->d()->callData->args[1], -1);
+ QVariant v2 = ctx->engine()->toVariant(ctx->args()[1], -1);
if (v2.userType() == QVariant::String) {
bool ok = false;
v2 = QQmlStringConverters::colorFromString(v2.toString(), &ok);
@@ -592,20 +592,20 @@ If \a format is not specified, \a date is formatted using
*/
ReturnedValue QtObject::method_formatDate(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 2)
+ if (ctx->argc() < 1 || ctx->argc() > 2)
V4THROW_ERROR("Qt.formatDate(): Invalid arguments");
QV4::Scope scope(ctx);
Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate;
- QDate date = ctx->engine()->toVariant(ctx->d()->callData->args[0], -1).toDateTime().date();
+ QDate date = ctx->engine()->toVariant(ctx->args()[0], -1).toDateTime().date();
QString formattedDate;
- if (ctx->d()->callData->argc == 2) {
- QV4::ScopedString s(scope, ctx->d()->callData->args[1]);
+ if (ctx->argc() == 2) {
+ QV4::ScopedString s(scope, ctx->args()[1]);
if (s) {
QString format = s->toQString();
formattedDate = date.toString(format);
- } else if (ctx->d()->callData->args[1].isNumber()) {
- quint32 intFormat = ctx->d()->callData->args[1].asDouble();
+ } else if (ctx->args()[1].isNumber()) {
+ quint32 intFormat = ctx->args()[1].asDouble();
Qt::DateFormat format = Qt::DateFormat(intFormat);
formattedDate = date.toString(format);
} else {
@@ -635,26 +635,26 @@ If \a format is not specified, \a time is formatted using
*/
ReturnedValue QtObject::method_formatTime(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 2)
+ if (ctx->argc() < 1 || ctx->argc() > 2)
V4THROW_ERROR("Qt.formatTime(): Invalid arguments");
QV4::Scope scope(ctx);
- QVariant argVariant = ctx->engine()->toVariant(ctx->d()->callData->args[0], -1);
+ QVariant argVariant = ctx->engine()->toVariant(ctx->args()[0], -1);
QTime time;
- if (ctx->d()->callData->args[0].asDateObject() || (argVariant.type() == QVariant::String))
+ if (ctx->args()[0].asDateObject() || (argVariant.type() == QVariant::String))
time = argVariant.toDateTime().time();
else // if (argVariant.type() == QVariant::Time), or invalid.
time = argVariant.toTime();
Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate;
QString formattedTime;
- if (ctx->d()->callData->argc == 2) {
- QV4::ScopedString s(scope, ctx->d()->callData->args[1]);
+ if (ctx->argc() == 2) {
+ QV4::ScopedString s(scope, ctx->args()[1]);
if (s) {
QString format = s->toQString();
formattedTime = time.toString(format);
- } else if (ctx->d()->callData->args[1].isNumber()) {
- quint32 intFormat = ctx->d()->callData->args[1].asDouble();
+ } else if (ctx->args()[1].isNumber()) {
+ quint32 intFormat = ctx->args()[1].asDouble();
Qt::DateFormat format = Qt::DateFormat(intFormat);
formattedTime = time.toString(format);
} else {
@@ -759,20 +759,20 @@ with the \a format values below to produce the following results:
*/
ReturnedValue QtObject::method_formatDateTime(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 2)
+ if (ctx->argc() < 1 || ctx->argc() > 2)
V4THROW_ERROR("Qt.formatDateTime(): Invalid arguments");
QV4::Scope scope(ctx);
Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate;
- QDateTime dt = ctx->engine()->toVariant(ctx->d()->callData->args[0], -1).toDateTime();
+ QDateTime dt = ctx->engine()->toVariant(ctx->args()[0], -1).toDateTime();
QString formattedDt;
- if (ctx->d()->callData->argc == 2) {
- QV4::ScopedString s(scope, ctx->d()->callData->args[1]);
+ if (ctx->argc() == 2) {
+ QV4::ScopedString s(scope, ctx->args()[1]);
if (s) {
QString format = s->toQString();
formattedDt = dt.toString(format);
- } else if (ctx->d()->callData->args[1].isNumber()) {
- quint32 intFormat = ctx->d()->callData->args[1].asDouble();
+ } else if (ctx->args()[1].isNumber()) {
+ quint32 intFormat = ctx->args()[1].asDouble();
Qt::DateFormat format = Qt::DateFormat(intFormat);
formattedDt = dt.toString(format);
} else {
@@ -791,7 +791,7 @@ Attempts to open the specified \c target url in an external application, based o
*/
ReturnedValue QtObject::method_openUrlExternally(QV4::CallContext *ctx)
{
- if (ctx->d()->callData->argc != 1)
+ if (ctx->argc() != 1)
return QV4::Encode(false);
QUrl url(Value::fromReturnedValue(method_resolvedUrl(ctx)).toQStringNoThrow());
@@ -806,7 +806,7 @@ ReturnedValue QtObject::method_resolvedUrl(QV4::CallContext *ctx)
{
QV8Engine *v8engine = ctx->d()->engine->v8Engine;
- QUrl url = ctx->engine()->toVariant(ctx->d()->callData->args[0], -1).toUrl();
+ QUrl url = ctx->engine()->toVariant(ctx->args()[0], -1).toUrl();
QQmlEngine *e = v8engine->engine();
QQmlEnginePrivate *p = 0;
if (e) p = QQmlEnginePrivate::get(e);
@@ -827,7 +827,7 @@ Returns a list of the font families available to the application.
*/
ReturnedValue QtObject::method_fontFamilies(CallContext *ctx)
{
- if (ctx->d()->callData->argc != 0)
+ if (ctx->argc() != 0)
V4THROW_ERROR("Qt.fontFamilies(): Invalid arguments");
return ctx->engine()->fromVariant(QVariant(QQml_guiProvider()->fontFamilies()));
@@ -839,10 +839,10 @@ Returns a hex string of the md5 hash of \c data.
*/
ReturnedValue QtObject::method_md5(CallContext *ctx)
{
- if (ctx->d()->callData->argc != 1)
+ if (ctx->argc() != 1)
V4THROW_ERROR("Qt.md5(): Invalid arguments");
- QByteArray data = ctx->d()->callData->args[0].toQStringNoThrow().toUtf8();
+ QByteArray data = ctx->args()[0].toQStringNoThrow().toUtf8();
QByteArray result = QCryptographicHash::hash(data, QCryptographicHash::Md5);
return ctx->d()->engine->newString(QLatin1String(result.toHex()))->asReturnedValue();
}
@@ -853,10 +853,10 @@ Binary to ASCII - this function returns a base64 encoding of \c data.
*/
ReturnedValue QtObject::method_btoa(CallContext *ctx)
{
- if (ctx->d()->callData->argc != 1)
+ if (ctx->argc() != 1)
V4THROW_ERROR("Qt.btoa(): Invalid arguments");
- QByteArray data = ctx->d()->callData->args[0].toQStringNoThrow().toUtf8();
+ QByteArray data = ctx->args()[0].toQStringNoThrow().toUtf8();
return ctx->d()->engine->newString(QLatin1String(data.toBase64()))->asReturnedValue();
}
@@ -867,10 +867,10 @@ ASCII to binary - this function returns a base64 decoding of \c data.
*/
ReturnedValue QtObject::method_atob(CallContext *ctx)
{
- if (ctx->d()->callData->argc != 1)
+ if (ctx->argc() != 1)
V4THROW_ERROR("Qt.atob(): Invalid arguments");
- QByteArray data = ctx->d()->callData->args[0].toQStringNoThrow().toLatin1();
+ QByteArray data = ctx->args()[0].toQStringNoThrow().toLatin1();
return ctx->d()->engine->newString(QString::fromUtf8(QByteArray::fromBase64(data)))->asReturnedValue();
}
@@ -915,7 +915,7 @@ See \l {Dynamic QML Object Creation from JavaScript} for more information on usi
ReturnedValue QtObject::method_createQmlObject(CallContext *ctx)
{
Scope scope(ctx);
- if (ctx->d()->callData->argc < 2 || ctx->d()->callData->argc > 3)
+ if (ctx->argc() < 2 || ctx->argc() > 3)
V4THROW_ERROR("Qt.createQmlObject(): Invalid arguments");
struct Error {
@@ -957,13 +957,13 @@ ReturnedValue QtObject::method_createQmlObject(CallContext *ctx)
effectiveContext = context->asQQmlContext();
Q_ASSERT(effectiveContext);
- QString qml = ctx->d()->callData->args[0].toQStringNoThrow();
+ QString qml = ctx->args()[0].toQStringNoThrow();
if (qml.isEmpty())
return QV4::Encode::null();
QUrl url;
- if (ctx->d()->callData->argc > 2)
- url = QUrl(ctx->d()->callData->args[2].toQStringNoThrow());
+ if (ctx->argc() > 2)
+ url = QUrl(ctx->args()[2].toQStringNoThrow());
else
url = QUrl(QLatin1String("inline"));
@@ -971,7 +971,7 @@ ReturnedValue QtObject::method_createQmlObject(CallContext *ctx)
url = context->resolvedUrl(url);
QObject *parentArg = 0;
- QV4::Scoped<QV4::QObjectWrapper> qobjectWrapper(scope, ctx->d()->callData->args[1]);
+ QV4::Scoped<QV4::QObjectWrapper> qobjectWrapper(scope, ctx->args()[1]);
if (!!qobjectWrapper)
parentArg = qobjectWrapper->object();
if (!parentArg)
@@ -1047,7 +1047,7 @@ use \l{QtQml::Qt::createQmlObject()}{Qt.createQmlObject()}.
*/
ReturnedValue QtObject::method_createComponent(CallContext *ctx)
{
- if (ctx->d()->callData->argc < 1 || ctx->d()->callData->argc > 3)
+ if (ctx->argc() < 1 || ctx->argc() > 3)
return ctx->engine()->throwError(QStringLiteral("Qt.createComponent(): Invalid arguments"));
Scope scope(ctx);
@@ -1061,7 +1061,7 @@ ReturnedValue QtObject::method_createComponent(CallContext *ctx)
if (context->isPragmaLibraryContext)
effectiveContext = 0;
- QString arg = ctx->d()->callData->args[0].toQStringNoThrow();
+ QString arg = ctx->args()[0].toQStringNoThrow();
if (arg.isEmpty())
return QV4::Encode::null();
@@ -1069,23 +1069,23 @@ ReturnedValue QtObject::method_createComponent(CallContext *ctx)
QObject *parentArg = 0;
int consumedCount = 1;
- if (ctx->d()->callData->argc > 1) {
- ScopedValue lastArg(scope, ctx->d()->callData->args[ctx->d()->callData->argc-1]);
+ if (ctx->argc() > 1) {
+ ScopedValue lastArg(scope, ctx->args()[ctx->argc()-1]);
// The second argument could be the mode enum
- if (ctx->d()->callData->args[1].isInteger()) {
- int mode = ctx->d()->callData->args[1].integerValue();
+ if (ctx->args()[1].isInteger()) {
+ int mode = ctx->args()[1].integerValue();
if (mode != int(QQmlComponent::PreferSynchronous) && mode != int(QQmlComponent::Asynchronous))
return ctx->engine()->throwError(QStringLiteral("Qt.createComponent(): Invalid arguments"));
compileMode = QQmlComponent::CompilationMode(mode);
consumedCount += 1;
} else {
// The second argument could be the parent only if there are exactly two args
- if ((ctx->d()->callData->argc != 2) || !(lastArg->isObject() || lastArg->isNull()))
+ if ((ctx->argc() != 2) || !(lastArg->isObject() || lastArg->isNull()))
return ctx->engine()->throwError(QStringLiteral("Qt.createComponent(): Invalid arguments"));
}
- if (consumedCount < ctx->d()->callData->argc) {
+ if (consumedCount < ctx->argc()) {
if (lastArg->isObject()) {
Scoped<QObjectWrapper> qobjectWrapper(scope, lastArg);
if (qobjectWrapper)
@@ -1132,13 +1132,13 @@ ReturnedValue QtObject::method_createComponent(CallContext *ctx)
ReturnedValue QtObject::method_locale(CallContext *ctx)
{
QString code;
- if (ctx->d()->callData->argc > 1)
+ if (ctx->argc() > 1)
V4THROW_ERROR("locale() requires 0 or 1 argument");
- if (ctx->d()->callData->argc == 1 && !ctx->d()->callData->args[0].isString())
+ if (ctx->argc() == 1 && !ctx->args()[0].isString())
V4THROW_TYPE("locale(): argument (locale code) must be a string");
- if (ctx->d()->callData->argc == 1)
- code = ctx->d()->callData->args[0].toQStringNoThrow();
+ if (ctx->argc() == 1)
+ code = ctx->args()[0].toQStringNoThrow();
return QQmlLocale::locale(ctx->engine(), code);
}
@@ -1219,9 +1219,9 @@ DEFINE_OBJECT_VTABLE(QQmlBindingFunction);
*/
ReturnedValue QtObject::method_binding(CallContext *ctx)
{
- if (ctx->d()->callData->argc != 1)
+ if (ctx->argc() != 1)
V4THROW_ERROR("binding() requires 1 argument");
- QV4::FunctionObject *f = ctx->d()->callData->args[0].asFunctionObject();
+ QV4::FunctionObject *f = ctx->args()[0].asFunctionObject();
if (!f)
V4THROW_TYPE("binding(): argument (binding expression) must be a function");
@@ -1232,7 +1232,7 @@ ReturnedValue QtObject::method_binding(CallContext *ctx)
ReturnedValue QtObject::method_get_platform(CallContext *ctx)
{
// ### inefficient. Should be just a value based getter
- Object *o = ctx->d()->callData->thisObject.asObject();
+ Object *o = ctx->thisObject().asObject();
if (!o)
return ctx->engine()->throwTypeError();
QtObject *qt = o->as<QtObject>();
@@ -1249,7 +1249,7 @@ ReturnedValue QtObject::method_get_platform(CallContext *ctx)
ReturnedValue QtObject::method_get_application(CallContext *ctx)
{
// ### inefficient. Should be just a value based getter
- Object *o = ctx->d()->callData->thisObject.asObject();
+ Object *o = ctx->thisObject().asObject();
if (!o)
return ctx->engine()->throwTypeError();
QtObject *qt = o->as<QtObject>();
@@ -1340,14 +1340,14 @@ static QV4::ReturnedValue writeToConsole(ConsoleLogTypes logType, CallContext *c
QString result;
QV4::ExecutionEngine *v4 = ctx->d()->engine;
- for (int i = 0; i < ctx->d()->callData->argc; ++i) {
+ for (int i = 0; i < ctx->argc(); ++i) {
if (i != 0)
result.append(QLatin1Char(' '));
- if (ctx->d()->callData->args[i].asArrayObject())
- result.append(QStringLiteral("[") + ctx->d()->callData->args[i].toQStringNoThrow() + QStringLiteral("]"));
+ if (ctx->args()[i].asArrayObject())
+ result.append(QStringLiteral("[") + ctx->args()[i].toQStringNoThrow() + QStringLiteral("]"));
else
- result.append(ctx->d()->callData->args[i].toQStringNoThrow());
+ result.append(ctx->args()[i].toQStringNoThrow());
}
if (printStack) {
@@ -1442,24 +1442,24 @@ QV4::ReturnedValue ConsoleObject::method_profileEnd(CallContext *ctx)
QV4::ReturnedValue ConsoleObject::method_time(CallContext *ctx)
{
- if (ctx->d()->callData->argc != 1)
+ if (ctx->argc() != 1)
V4THROW_ERROR("console.time(): Invalid arguments");
QV8Engine *v8engine = ctx->d()->engine->v8Engine;
- QString name = ctx->d()->callData->args[0].toQStringNoThrow();
+ QString name = ctx->args()[0].toQStringNoThrow();
v8engine->startTimer(name);
return QV4::Encode::undefined();
}
QV4::ReturnedValue ConsoleObject::method_timeEnd(CallContext *ctx)
{
- if (ctx->d()->callData->argc != 1)
+ if (ctx->argc() != 1)
V4THROW_ERROR("console.time(): Invalid arguments");
QV8Engine *v8engine = ctx->d()->engine->v8Engine;
- QString name = ctx->d()->callData->args[0].toQStringNoThrow();
+ QString name = ctx->args()[0].toQStringNoThrow();
bool wasRunning;
qint64 elapsed = v8engine->stopTimer(name, &wasRunning);
if (wasRunning) {
@@ -1472,8 +1472,8 @@ QV4::ReturnedValue ConsoleObject::method_count(CallContext *ctx)
{
// first argument: name to print. Ignore any additional arguments
QString name;
- if (ctx->d()->callData->argc > 0)
- name = ctx->d()->callData->args[0].toQStringNoThrow();
+ if (ctx->argc() > 0)
+ name = ctx->args()[0].toQStringNoThrow();
QV4::ExecutionEngine *v4 = ctx->d()->engine;
QV8Engine *v8engine = ctx->d()->engine->v8Engine;
@@ -1494,7 +1494,7 @@ QV4::ReturnedValue ConsoleObject::method_count(CallContext *ctx)
QV4::ReturnedValue ConsoleObject::method_trace(CallContext *ctx)
{
- if (ctx->d()->callData->argc != 0)
+ if (ctx->argc() != 0)
V4THROW_ERROR("console.trace(): Invalid arguments");
QV4::ExecutionEngine *v4 = ctx->d()->engine;
@@ -1516,18 +1516,18 @@ QV4::ReturnedValue ConsoleObject::method_warn(CallContext *ctx)
QV4::ReturnedValue ConsoleObject::method_assert(CallContext *ctx)
{
- if (ctx->d()->callData->argc == 0)
+ if (ctx->argc() == 0)
V4THROW_ERROR("console.assert(): Missing argument");
QV4::ExecutionEngine *v4 = ctx->d()->engine;
- if (!ctx->d()->callData->args[0].toBoolean()) {
+ if (!ctx->args()[0].toBoolean()) {
QString message;
- for (int i = 1; i < ctx->d()->callData->argc; ++i) {
+ for (int i = 1; i < ctx->argc(); ++i) {
if (i != 1)
message.append(QLatin1Char(' '));
- message.append(ctx->d()->callData->args[i].toQStringNoThrow());
+ message.append(ctx->args()[i].toQStringNoThrow());
}
QString stack = jsStack(v4);
@@ -1543,7 +1543,7 @@ QV4::ReturnedValue ConsoleObject::method_assert(CallContext *ctx)
QV4::ReturnedValue ConsoleObject::method_exception(CallContext *ctx)
{
- if (ctx->d()->callData->argc == 0)
+ if (ctx->argc() == 0)
V4THROW_ERROR("console.exception(): Missing argument");
writeToConsole(Error, ctx, true);
@@ -1601,29 +1601,29 @@ void QV4::GlobalExtensions::init(QQmlEngine *qmlEngine, Object *globalObject)
*/
ReturnedValue GlobalExtensions::method_qsTranslate(CallContext *ctx)
{
- if (ctx->d()->callData->argc < 2)
+ if (ctx->argc() < 2)
V4THROW_ERROR("qsTranslate() requires at least two arguments");
- if (!ctx->d()->callData->args[0].isString())
+ if (!ctx->args()[0].isString())
V4THROW_ERROR("qsTranslate(): first argument (context) must be a string");
- if (!ctx->d()->callData->args[1].isString())
+ if (!ctx->args()[1].isString())
V4THROW_ERROR("qsTranslate(): second argument (sourceText) must be a string");
- if ((ctx->d()->callData->argc > 2) && !ctx->d()->callData->args[2].isString())
+ if ((ctx->argc() > 2) && !ctx->args()[2].isString())
V4THROW_ERROR("qsTranslate(): third argument (disambiguation) must be a string");
- QString context = ctx->d()->callData->args[0].toQStringNoThrow();
- QString text = ctx->d()->callData->args[1].toQStringNoThrow();
+ QString context = ctx->args()[0].toQStringNoThrow();
+ QString text = ctx->args()[1].toQStringNoThrow();
QString comment;
- if (ctx->d()->callData->argc > 2) comment = ctx->d()->callData->args[2].toQStringNoThrow();
+ if (ctx->argc() > 2) comment = ctx->args()[2].toQStringNoThrow();
int i = 3;
- if (ctx->d()->callData->argc > i && ctx->d()->callData->args[i].isString()) {
+ if (ctx->argc() > i && ctx->args()[i].isString()) {
qWarning("qsTranslate(): specifying the encoding as fourth argument is deprecated");
++i;
}
int n = -1;
- if (ctx->d()->callData->argc > i)
- n = ctx->d()->callData->args[i].toInt32();
+ if (ctx->argc() > i)
+ n = ctx->args()[i].toInt32();
QString result = QCoreApplication::translate(context.toUtf8().constData(),
text.toUtf8().constData(),
@@ -1657,9 +1657,9 @@ ReturnedValue GlobalExtensions::method_qsTranslate(CallContext *ctx)
*/
ReturnedValue GlobalExtensions::method_qsTranslateNoOp(CallContext *ctx)
{
- if (ctx->d()->callData->argc < 2)
+ if (ctx->argc() < 2)
return QV4::Encode::undefined();
- return ctx->d()->callData->args[1].asReturnedValue();
+ return ctx->args()[1].asReturnedValue();
}
/*!
@@ -1681,13 +1681,13 @@ ReturnedValue GlobalExtensions::method_qsTranslateNoOp(CallContext *ctx)
*/
ReturnedValue GlobalExtensions::method_qsTr(CallContext *ctx)
{
- if (ctx->d()->callData->argc < 1)
+ if (ctx->argc() < 1)
V4THROW_ERROR("qsTr() requires at least one argument");
- if (!ctx->d()->callData->args[0].isString())
+ if (!ctx->args()[0].isString())
V4THROW_ERROR("qsTr(): first argument (sourceText) must be a string");
- if ((ctx->d()->callData->argc > 1) && !ctx->d()->callData->args[1].isString())
+ if ((ctx->argc() > 1) && !ctx->args()[1].isString())
V4THROW_ERROR("qsTr(): second argument (disambiguation) must be a string");
- if ((ctx->d()->callData->argc > 2) && !ctx->d()->callData->args[2].isNumber())
+ if ((ctx->argc() > 2) && !ctx->args()[2].isNumber())
V4THROW_ERROR("qsTr(): third argument (n) must be a number");
Scope scope(ctx);
@@ -1719,13 +1719,13 @@ ReturnedValue GlobalExtensions::method_qsTr(CallContext *ctx)
}
}
- QString text = ctx->d()->callData->args[0].toQStringNoThrow();
+ QString text = ctx->args()[0].toQStringNoThrow();
QString comment;
- if (ctx->d()->callData->argc > 1)
- comment = ctx->d()->callData->args[1].toQStringNoThrow();
+ if (ctx->argc() > 1)
+ comment = ctx->args()[1].toQStringNoThrow();
int n = -1;
- if (ctx->d()->callData->argc > 2)
- n = ctx->d()->callData->args[2].toInt32();
+ if (ctx->argc() > 2)
+ n = ctx->args()[2].toInt32();
QString result = QCoreApplication::translate(context.toUtf8().constData(), text.toUtf8().constData(),
comment.toUtf8().constData(), n);
@@ -1757,9 +1757,9 @@ ReturnedValue GlobalExtensions::method_qsTr(CallContext *ctx)
*/
ReturnedValue GlobalExtensions::method_qsTrNoOp(CallContext *ctx)
{
- if (ctx->d()->callData->argc < 1)
+ if (ctx->argc() < 1)
return QV4::Encode::undefined();
- return ctx->d()->callData->args[0].asReturnedValue();
+ return ctx->args()[0].asReturnedValue();
}
/*!
@@ -1794,18 +1794,18 @@ ReturnedValue GlobalExtensions::method_qsTrNoOp(CallContext *ctx)
*/
ReturnedValue GlobalExtensions::method_qsTrId(CallContext *ctx)
{
- if (ctx->d()->callData->argc < 1)
+ if (ctx->argc() < 1)
V4THROW_ERROR("qsTrId() requires at least one argument");
- if (!ctx->d()->callData->args[0].isString())
+ if (!ctx->args()[0].isString())
V4THROW_TYPE("qsTrId(): first argument (id) must be a string");
- if (ctx->d()->callData->argc > 1 && !ctx->d()->callData->args[1].isNumber())
+ if (ctx->argc() > 1 && !ctx->args()[1].isNumber())
V4THROW_TYPE("qsTrId(): second argument (n) must be a number");
int n = -1;
- if (ctx->d()->callData->argc > 1)
- n = ctx->d()->callData->args[1].toInt32();
+ if (ctx->argc() > 1)
+ n = ctx->args()[1].toInt32();
- return ctx->d()->engine->newString(qtTrId(ctx->d()->callData->args[0].toQStringNoThrow().toUtf8().constData(), n))->asReturnedValue();
+ return ctx->d()->engine->newString(qtTrId(ctx->args()[0].toQStringNoThrow().toUtf8().constData(), n))->asReturnedValue();
}
/*!
@@ -1826,9 +1826,9 @@ ReturnedValue GlobalExtensions::method_qsTrId(CallContext *ctx)
*/
ReturnedValue GlobalExtensions::method_qsTrIdNoOp(CallContext *ctx)
{
- if (ctx->d()->callData->argc < 1)
+ if (ctx->argc() < 1)
return QV4::Encode::undefined();
- return ctx->d()->callData->args[0].asReturnedValue();
+ return ctx->args()[0].asReturnedValue();
}
#endif // QT_NO_TRANSLATION
@@ -1844,13 +1844,13 @@ QV4::ReturnedValue GlobalExtensions::method_gc(CallContext *ctx)
ReturnedValue GlobalExtensions::method_string_arg(CallContext *ctx)
{
- if (ctx->d()->callData->argc != 1)
+ if (ctx->argc() != 1)
V4THROW_ERROR("String.arg(): Invalid arguments");
- QString value = ctx->d()->callData->thisObject.toQString();
+ QString value = ctx->thisObject().toQString();
QV4::Scope scope(ctx);
- QV4::ScopedValue arg(scope, ctx->d()->callData->args[0]);
+ QV4::ScopedValue arg(scope, ctx->args()[0]);
if (arg->isInteger())
return ctx->d()->engine->newString(value.arg(arg->integerValue()))->asReturnedValue();
else if (arg->isDouble())
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 23:05:45 +0000