diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-11-03 15:23:05 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-09 02:01:17 +0100 |
commit | 412eb94de4cae754130ae855236420ebd5c42482 (patch) | |
tree | 901af6051691c65a96abe3f69fcd3d5fc57ff80a /src/qml/qml | |
parent | e367f75d7285d2bcd10cbb35d088c96f33c02aff (diff) |
Simplify & speed up function calling
Get rid of the SimpleCallContext, instead simply
use the CallContext data structure, but don't
initialize the unused variables.
Change-Id: I11b311986da180c62c815b516a2c55844156d0ab
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml')
-rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 20 | ||||
-rw-r--r-- | src/qml/qml/qqmllocale.cpp | 98 | ||||
-rw-r--r-- | src/qml/qml/qqmllocale_p.h | 22 | ||||
-rw-r--r-- | src/qml/qml/qqmlvaluetypewrapper.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlvaluetypewrapper_p.h | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlxmlhttprequest.cpp | 146 | ||||
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 106 | ||||
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions_p.h | 106 |
8 files changed, 251 insertions, 251 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index ea88acd85f..2973944215 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1113,11 +1113,11 @@ class QmlIncubatorObject : public QV4::Object public: QmlIncubatorObject(QV8Engine *engine, QQmlIncubator::IncubationMode = QQmlIncubator::Asynchronous); - static QV4::ReturnedValue method_get_statusChanged(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_set_statusChanged(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_status(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_object(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_forceCompletion(QV4::SimpleCallContext *ctx); + static QV4::ReturnedValue method_get_statusChanged(QV4::CallContext *ctx); + static QV4::ReturnedValue method_set_statusChanged(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_status(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_object(QV4::CallContext *ctx); + static QV4::ReturnedValue method_forceCompletion(QV4::CallContext *ctx); static void destroy(Managed *that); static void markObjects(Managed *that, QV4::ExecutionEngine *e); @@ -1444,7 +1444,7 @@ QQmlComponentExtension::QQmlComponentExtension(QV8Engine *engine) incubationProto = proto; } -QV4::ReturnedValue QmlIncubatorObject::method_get_object(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QmlIncubatorObject::method_get_object(QV4::CallContext *ctx) { QV4::Scope scope(ctx); QV4::Scoped<QmlIncubatorObject> o(scope, ctx->callData->thisObject.as<QmlIncubatorObject>()); @@ -1454,7 +1454,7 @@ QV4::ReturnedValue QmlIncubatorObject::method_get_object(QV4::SimpleCallContext return QV4::QObjectWrapper::wrap(ctx->engine, o->incubator->object()); } -QV4::ReturnedValue QmlIncubatorObject::method_forceCompletion(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QmlIncubatorObject::method_forceCompletion(QV4::CallContext *ctx) { QV4::Scope scope(ctx); QV4::Scoped<QmlIncubatorObject> o(scope, ctx->callData->thisObject.as<QmlIncubatorObject>()); @@ -1466,7 +1466,7 @@ QV4::ReturnedValue QmlIncubatorObject::method_forceCompletion(QV4::SimpleCallCon return QV4::Encode::undefined(); } -QV4::ReturnedValue QmlIncubatorObject::method_get_status(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QmlIncubatorObject::method_get_status(QV4::CallContext *ctx) { QV4::Scope scope(ctx); QV4::Scoped<QmlIncubatorObject> o(scope, ctx->callData->thisObject.as<QmlIncubatorObject>()); @@ -1476,7 +1476,7 @@ QV4::ReturnedValue QmlIncubatorObject::method_get_status(QV4::SimpleCallContext return QV4::Encode(o->incubator->status()); } -QV4::ReturnedValue QmlIncubatorObject::method_get_statusChanged(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QmlIncubatorObject::method_get_statusChanged(QV4::CallContext *ctx) { QV4::Scope scope(ctx); QV4::Scoped<QmlIncubatorObject> o(scope, ctx->callData->thisObject.as<QmlIncubatorObject>()); @@ -1486,7 +1486,7 @@ QV4::ReturnedValue QmlIncubatorObject::method_get_statusChanged(QV4::SimpleCallC return o->m_statusChanged.asReturnedValue(); } -QV4::ReturnedValue QmlIncubatorObject::method_set_statusChanged(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QmlIncubatorObject::method_set_statusChanged(QV4::CallContext *ctx) { QV4::Scope scope(ctx); QV4::Scoped<QmlIncubatorObject> o(scope, ctx->callData->thisObject.as<QmlIncubatorObject>()); diff --git a/src/qml/qml/qqmllocale.cpp b/src/qml/qml/qqmllocale.cpp index b92b3e4c2c..5e8130f407 100644 --- a/src/qml/qml/qqmllocale.cpp +++ b/src/qml/qml/qqmllocale.cpp @@ -67,7 +67,7 @@ public: QLocale locale; - static QLocale *getThisLocale(QV4::SimpleCallContext *ctx) { + static QLocale *getThisLocale(QV4::CallContext *ctx) { QQmlLocaleData *thisObject = ctx->callData->thisObject.asObject()->as<QQmlLocaleData>(); if (!thisObject) { ctx->throwTypeError(); @@ -76,33 +76,33 @@ public: return &thisObject->locale; } - static QV4::ReturnedValue method_currencySymbol(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_dateTimeFormat(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_timeFormat(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_dateFormat(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_monthName(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_standaloneMonthName(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_dayName(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_standaloneDayName(QV4::SimpleCallContext *ctx); - - static QV4::ReturnedValue method_get_firstDayOfWeek(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_measurementSystem(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_textDirection(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_weekDays(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_uiLanguages(QV4::SimpleCallContext *ctx); - - static QV4::ReturnedValue method_get_name(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_nativeLanguageName(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_nativeCountryName(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_decimalPoint(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_groupSeparator(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_percent(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_zeroDigit(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_negativeSign(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_positiveSign(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_exponential(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_amText(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_get_pmText(QV4::SimpleCallContext *ctx); + static QV4::ReturnedValue method_currencySymbol(QV4::CallContext *ctx); + static QV4::ReturnedValue method_dateTimeFormat(QV4::CallContext *ctx); + static QV4::ReturnedValue method_timeFormat(QV4::CallContext *ctx); + static QV4::ReturnedValue method_dateFormat(QV4::CallContext *ctx); + static QV4::ReturnedValue method_monthName(QV4::CallContext *ctx); + static QV4::ReturnedValue method_standaloneMonthName(QV4::CallContext *ctx); + static QV4::ReturnedValue method_dayName(QV4::CallContext *ctx); + static QV4::ReturnedValue method_standaloneDayName(QV4::CallContext *ctx); + + static QV4::ReturnedValue method_get_firstDayOfWeek(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_measurementSystem(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_textDirection(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_weekDays(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_uiLanguages(QV4::CallContext *ctx); + + static QV4::ReturnedValue method_get_name(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_nativeLanguageName(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_nativeCountryName(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_decimalPoint(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_groupSeparator(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_percent(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_zeroDigit(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_negativeSign(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_positiveSign(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_exponential(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_amText(QV4::CallContext *ctx); + static QV4::ReturnedValue method_get_pmText(QV4::CallContext *ctx); private: static void destroy(Managed *that) @@ -137,7 +137,7 @@ void QQmlDateExtension::registerExtension(QV4::ExecutionEngine *engine) engine->dateCtor.objectValue()->defineDefaultProperty(QStringLiteral("timeZoneUpdated"), method_timeZoneUpdated); } -QV4::ReturnedValue QQmlDateExtension::method_toLocaleString(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlDateExtension::method_toLocaleString(QV4::CallContext *ctx) { if (ctx->callData->argc > 2) return QV4::DatePrototype::method_toLocaleString(ctx); @@ -181,7 +181,7 @@ QV4::ReturnedValue QQmlDateExtension::method_toLocaleString(QV4::SimpleCallConte return ctx->engine->newString(formattedDt)->asReturnedValue(); } -QV4::ReturnedValue QQmlDateExtension::method_toLocaleTimeString(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlDateExtension::method_toLocaleTimeString(QV4::CallContext *ctx) { if (ctx->callData->argc > 2) return QV4::DatePrototype::method_toLocaleTimeString(ctx); @@ -226,7 +226,7 @@ QV4::ReturnedValue QQmlDateExtension::method_toLocaleTimeString(QV4::SimpleCallC return ctx->engine->newString(formattedTime)->asReturnedValue(); } -QV4::ReturnedValue QQmlDateExtension::method_toLocaleDateString(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlDateExtension::method_toLocaleDateString(QV4::CallContext *ctx) { if (ctx->callData->argc > 2) return QV4::DatePrototype::method_toLocaleDateString(ctx); @@ -271,7 +271,7 @@ QV4::ReturnedValue QQmlDateExtension::method_toLocaleDateString(QV4::SimpleCallC return ctx->engine->newString(formattedDate)->asReturnedValue(); } -QV4::ReturnedValue QQmlDateExtension::method_fromLocaleString(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlDateExtension::method_fromLocaleString(QV4::CallContext *ctx) { QV4::ExecutionEngine * const engine = ctx->engine; if (ctx->callData->argc == 1 && ctx->callData->args[0].isString()) { @@ -309,7 +309,7 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleString(QV4::SimpleCallCon return QV4::Encode(engine->newDateObject(dt)); } -QV4::ReturnedValue QQmlDateExtension::method_fromLocaleTimeString(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlDateExtension::method_fromLocaleTimeString(QV4::CallContext *ctx) { QV4::ExecutionEngine * const engine = ctx->engine; @@ -353,7 +353,7 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleTimeString(QV4::SimpleCal return QV4::Encode(engine->newDateObject(dt)); } -QV4::ReturnedValue QQmlDateExtension::method_fromLocaleDateString(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlDateExtension::method_fromLocaleDateString(QV4::CallContext *ctx) { QV4::ExecutionEngine * const engine = ctx->engine; @@ -392,7 +392,7 @@ QV4::ReturnedValue QQmlDateExtension::method_fromLocaleDateString(QV4::SimpleCal return QV4::Encode(engine->newDateObject(QDateTime(dt))); } -QV4::ReturnedValue QQmlDateExtension::method_timeZoneUpdated(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlDateExtension::method_timeZoneUpdated(QV4::CallContext *ctx) { if (ctx->callData->argc != 0) V4THROW_ERROR("Locale: Date.timeZoneUpdated(): Invalid arguments"); @@ -412,7 +412,7 @@ void QQmlNumberExtension::registerExtension(QV4::ExecutionEngine *engine) engine->numberCtor.objectValue()->defineDefaultProperty(QStringLiteral("fromLocaleString"), method_fromLocaleString); } -QV4::ReturnedValue QQmlNumberExtension::method_toLocaleString(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlNumberExtension::method_toLocaleString(QV4::CallContext *ctx) { if (ctx->callData->argc > 3) V4THROW_ERROR("Locale: Number.toLocaleString(): Invalid arguments"); @@ -450,7 +450,7 @@ QV4::ReturnedValue QQmlNumberExtension::method_toLocaleString(QV4::SimpleCallCon return ctx->engine->newString(r->locale.toString(number, (char)format, prec))->asReturnedValue(); } -QV4::ReturnedValue QQmlNumberExtension::method_toLocaleCurrencyString(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlNumberExtension::method_toLocaleCurrencyString(QV4::CallContext *ctx) { if (ctx->callData->argc > 2) V4THROW_ERROR("Locale: Number.toLocaleCurrencyString(): Invalid arguments"); @@ -480,7 +480,7 @@ QV4::ReturnedValue QQmlNumberExtension::method_toLocaleCurrencyString(QV4::Simpl return ctx->engine->newString(r->locale.toCurrencyString(number, symbol))->asReturnedValue(); } -QV4::ReturnedValue QQmlNumberExtension::method_fromLocaleString(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlNumberExtension::method_fromLocaleString(QV4::CallContext *ctx) { if (ctx->callData->argc < 1 || ctx->callData->argc > 2) V4THROW_ERROR("Locale: Number.fromLocaleString(): Invalid arguments"); @@ -516,7 +516,7 @@ QV4::ReturnedValue QQmlNumberExtension::method_fromLocaleString(QV4::SimpleCallC //-------------- // Locale object -QV4::ReturnedValue QQmlLocaleData::method_get_firstDayOfWeek(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlLocaleData::method_get_firstDayOfWeek(QV4::CallContext *ctx) { QLocale *locale = getThisLocale(ctx); if (!locale) @@ -527,7 +527,7 @@ QV4::ReturnedValue QQmlLocaleData::method_get_firstDayOfWeek(QV4::SimpleCallCont return QV4::Encode(fdow); } -QV4::ReturnedValue QQmlLocaleData::method_get_measurementSystem(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlLocaleData::method_get_measurementSystem(QV4::CallContext *ctx) { QLocale *locale = getThisLocale(ctx); if (!locale) @@ -535,7 +535,7 @@ QV4::ReturnedValue QQmlLocaleData::method_get_measurementSystem(QV4::SimpleCallC return QV4::Encode(locale->measurementSystem()); } -QV4::ReturnedValue QQmlLocaleData::method_get_textDirection(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlLocaleData::method_get_textDirection(QV4::CallContext *ctx) { QLocale *locale = getThisLocale(ctx); if (!locale) @@ -544,7 +544,7 @@ QV4::ReturnedValue QQmlLocaleData::method_get_textDirection(QV4::SimpleCallConte return QV4::Encode(locale->textDirection()); } -QV4::ReturnedValue QQmlLocaleData::method_get_weekDays(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlLocaleData::method_get_weekDays(QV4::CallContext *ctx) { QV4::Scope scope(ctx); QLocale *locale = getThisLocale(ctx); @@ -567,7 +567,7 @@ QV4::ReturnedValue QQmlLocaleData::method_get_weekDays(QV4::SimpleCallContext *c return result.asReturnedValue(); } -QV4::ReturnedValue QQmlLocaleData::method_get_uiLanguages(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlLocaleData::method_get_uiLanguages(QV4::CallContext *ctx) { QV4::Scope scope(ctx); QLocale *locale = getThisLocale(ctx); @@ -587,7 +587,7 @@ QV4::ReturnedValue QQmlLocaleData::method_get_uiLanguages(QV4::SimpleCallContext return result.asReturnedValue(); } -QV4::ReturnedValue QQmlLocaleData::method_currencySymbol(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlLocaleData::method_currencySymbol(QV4::CallContext *ctx) { QLocale *locale = getThisLocale(ctx); if (!locale) @@ -606,7 +606,7 @@ QV4::ReturnedValue QQmlLocaleData::method_currencySymbol(QV4::SimpleCallContext } #define LOCALE_FORMAT(FUNC) \ -QV4::ReturnedValue QQmlLocaleData::method_ ##FUNC (QV4::SimpleCallContext *ctx) { \ +QV4::ReturnedValue QQmlLocaleData::method_ ##FUNC (QV4::CallContext *ctx) { \ QLocale *locale = getThisLocale(ctx); \ if (!locale) \ return QV4::Encode::undefined(); \ @@ -626,7 +626,7 @@ LOCALE_FORMAT(dateFormat) // +1 added to idx because JS is 0-based, whereas QLocale months begin at 1. #define LOCALE_FORMATTED_MONTHNAME(VARIABLE) \ -QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::SimpleCallContext *ctx) {\ +QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::CallContext *ctx) {\ QLocale *locale = getThisLocale(ctx); \ if (!locale) \ return QV4::Encode::undefined(); \ @@ -653,7 +653,7 @@ QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::SimpleCallContext * // 0 -> 7 as Qt::Sunday is 7, but Sunday is 0 in JS Date #define LOCALE_FORMATTED_DAYNAME(VARIABLE) \ -QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::SimpleCallContext *ctx) {\ +QV4::ReturnedValue QQmlLocaleData::method_ ## VARIABLE (QV4::CallContext *ctx) {\ QLocale *locale = getThisLocale(ctx); \ if (!locale) \ return QV4::Encode::undefined(); \ @@ -684,7 +684,7 @@ LOCALE_FORMATTED_MONTHNAME(standaloneMonthName) LOCALE_FORMATTED_DAYNAME(dayName) LOCALE_FORMATTED_DAYNAME(standaloneDayName) -#define LOCALE_STRING_PROPERTY(VARIABLE) QV4::ReturnedValue QQmlLocaleData::method_get_ ## VARIABLE (QV4::SimpleCallContext* ctx) \ +#define LOCALE_STRING_PROPERTY(VARIABLE) QV4::ReturnedValue QQmlLocaleData::method_get_ ## VARIABLE (QV4::CallContext* ctx) \ { \ QLocale *locale = getThisLocale(ctx); \ if (!locale) \ @@ -875,7 +875,7 @@ void QQmlLocale::registerStringLocaleCompare(QV4::ExecutionEngine *engine) engine->stringClass->prototype->defineDefaultProperty(QStringLiteral("localeCompare"), method_localeCompare); } -QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::SimpleCallContext *ctx) +QV4::ReturnedValue QQmlLocale::method_localeCompare(QV4::CallContext *ctx) { if (ctx->callData->argc != 1 || (!ctx->callData->args[0].isString() && !ctx->callData->args[0].asStringObject())) return QV4::StringPrototype::method_localeCompare(ctx); diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h index 8075bd462f..8ca67a8c83 100644 --- a/src/qml/qml/qqmllocale_p.h +++ b/src/qml/qml/qqmllocale_p.h @@ -58,13 +58,13 @@ public: static void registerExtension(QV4::ExecutionEngine *engine); private: - static QV4::ReturnedValue method_toLocaleString(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_toLocaleTimeString(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_toLocaleDateString(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_fromLocaleString(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_fromLocaleTimeString(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_fromLocaleDateString(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_timeZoneUpdated(QV4::SimpleCallContext *ctx); + static QV4::ReturnedValue method_toLocaleString(QV4::CallContext *ctx); + static QV4::ReturnedValue method_toLocaleTimeString(QV4::CallContext *ctx); + static QV4::ReturnedValue method_toLocaleDateString(QV4::CallContext *ctx); + static QV4::ReturnedValue method_fromLocaleString(QV4::CallContext *ctx); + static QV4::ReturnedValue method_fromLocaleTimeString(QV4::CallContext *ctx); + static QV4::ReturnedValue method_fromLocaleDateString(QV4::CallContext *ctx); + static QV4::ReturnedValue method_timeZoneUpdated(QV4::CallContext *ctx); }; @@ -74,9 +74,9 @@ public: static void registerExtension(QV4::ExecutionEngine *engine); private: - static QV4::ReturnedValue method_toLocaleString(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_fromLocaleString(QV4::SimpleCallContext *ctx); - static QV4::ReturnedValue method_toLocaleCurrencyString(QV4::SimpleCallContext *ctx); + static QV4::ReturnedValue method_toLocaleString(QV4::CallContext *ctx); + static QV4::ReturnedValue method_fromLocaleString(QV4::CallContext *ctx); + static QV4::ReturnedValue method_toLocaleCurrencyString(QV4::CallContext *ctx); }; @@ -125,7 +125,7 @@ public: private: QQmlLocale(); - static QV4::ReturnedValue method_localeCompare(QV4::SimpleCallContext *ctx); + static QV4::ReturnedValue method_localeCompare(QV4::CallContext *ctx); }; diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp index d6f35f1737..d733694923 100644 --- a/src/qml/qml/qqmlvaluetypewrapper.cpp +++ b/src/qml/qml/qqmlvaluetypewrapper.cpp @@ -244,7 +244,7 @@ bool QmlValueTypeWrapper::isEqual(const QVariant& value) } } -ReturnedValue QmlValueTypeWrapper::method_toString(SimpleCallContext *ctx) +ReturnedValue QmlValueTypeWrapper::method_toString(CallContext *ctx) { Object *o = ctx->callData->thisObject.asObject(); if (!o) diff --git a/src/qml/qml/qqmlvaluetypewrapper_p.h b/src/qml/qml/qqmlvaluetypewrapper_p.h index f2effc362b..9dd3e8dcbe 100644 --- a/src/qml/qml/qqmlvaluetypewrapper_p.h +++ b/src/qml/qml/qqmlvaluetypewrapper_p.h @@ -89,7 +89,7 @@ public: static bool isEqualTo(Managed *m, Managed *other); static PropertyAttributes query(const Managed *, StringRef name); - static QV4::ReturnedValue method_toString(SimpleCallContext *ctx); + static QV4::ReturnedValue method_toString(CallContext *ctx); QV8Engine *v8; ObjectType objectType; diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp index ccbc28e9f2..18e3e33c4b 100644 --- a/src/qml/qml/qqmlxmlhttprequest.cpp +++ b/src/qml/qml/qqmlxmlhttprequest.cpp @@ -279,24 +279,24 @@ public: static void initClass(ExecutionEngine *engine); // JS API - static ReturnedValue method_get_nodeName(SimpleCallContext *ctx); - static ReturnedValue method_get_nodeValue(SimpleCallContext *ctx); - static ReturnedValue method_get_nodeType(SimpleCallContext *ctx); - - static ReturnedValue method_get_parentNode(SimpleCallContext *ctx); - static ReturnedValue method_get_childNodes(SimpleCallContext *ctx); - static ReturnedValue method_get_firstChild(SimpleCallContext *ctx); - static ReturnedValue method_get_lastChild(SimpleCallContext *ctx); - static ReturnedValue method_get_previousSibling(SimpleCallContext *ctx); - static ReturnedValue method_get_nextSibling(SimpleCallContext *ctx); - static ReturnedValue method_get_attributes(SimpleCallContext *ctx); - - //static ReturnedValue ownerDocument(SimpleCallContext *ctx); - //static ReturnedValue namespaceURI(SimpleCallContext *ctx); - //static ReturnedValue prefix(SimpleCallContext *ctx); - //static ReturnedValue localName(SimpleCallContext *ctx); - //static ReturnedValue baseURI(SimpleCallContext *ctx); - //static ReturnedValue textContent(SimpleCallContext *ctx); + static ReturnedValue method_get_nodeName(CallContext *ctx); + static ReturnedValue method_get_nodeValue(CallContext *ctx); + static ReturnedValue method_get_nodeType(CallContext *ctx); + + static ReturnedValue method_get_parentNode(CallContext *ctx); + static ReturnedValue method_get_childNodes(CallContext *ctx); + static ReturnedValue method_get_firstChild(CallContext *ctx); + static ReturnedValue method_get_lastChild(CallContext *ctx); + static ReturnedValue method_get_previousSibling(CallContext *ctx); + static ReturnedValue method_get_nextSibling(CallContext *ctx); + static ReturnedValue method_get_attributes(CallContext *ctx); + + //static ReturnedValue ownerDocument(CallContext *ctx); + //static ReturnedValue namespaceURI(CallContext *ctx); + //static ReturnedValue prefix(CallContext *ctx); + //static ReturnedValue localName(CallContext *ctx); + //static ReturnedValue baseURI(CallContext *ctx); + //static ReturnedValue textContent(CallContext *ctx); static ReturnedValue getProto(ExecutionEngine *v4); @@ -352,12 +352,12 @@ class Attr : public Node { public: // JS API - static ReturnedValue method_name(SimpleCallContext *ctx); -// static ReturnedValue specified(SimpleCallContext *); - static ReturnedValue method_value(SimpleCallContext *ctx); - static ReturnedValue method_ownerElement(SimpleCallContext *ctx); -// static ReturnedValue schemaTypeInfo(SimpleCallContext *); -// static ReturnedValue isId(SimpleCallContext *c); + static ReturnedValue method_name(CallContext *ctx); +// static ReturnedValue specified(CallContext *); + static ReturnedValue method_value(CallContext *ctx); + static ReturnedValue method_ownerElement(CallContext *ctx); +// static ReturnedValue schemaTypeInfo(CallContext *); +// static ReturnedValue isId(CallContext *c); // C++ API static ReturnedValue prototype(ExecutionEngine *); @@ -367,7 +367,7 @@ class CharacterData : public Node { public: // JS API - static ReturnedValue method_length(SimpleCallContext *ctx); + static ReturnedValue method_length(CallContext *ctx); // C++ API static ReturnedValue prototype(ExecutionEngine *v4); @@ -377,8 +377,8 @@ class Text : public CharacterData { public: // JS API - static ReturnedValue method_isElementContentWhitespace(SimpleCallContext *ctx); - static ReturnedValue method_wholeText(SimpleCallContext *ctx); + static ReturnedValue method_isElementContentWhitespace(CallContext *ctx); + static ReturnedValue method_wholeText(CallContext *ctx); // C++ API static ReturnedValue prototype(ExecutionEngine *); @@ -395,10 +395,10 @@ class Document : public Node { public: // JS API - static ReturnedValue method_xmlVersion(SimpleCallContext *ctx); - static ReturnedValue method_xmlEncoding(SimpleCallContext *ctx); - static ReturnedValue method_xmlStandalone(SimpleCallContext *ctx); - static ReturnedValue method_documentElement(SimpleCallContext *ctx); + static ReturnedValue method_xmlVersion(CallContext *ctx); + static ReturnedValue method_xmlEncoding(CallContext *ctx); + static ReturnedValue method_xmlStandalone(CallContext *ctx); + static ReturnedValue method_documentElement(CallContext *ctx); // C++ API static ReturnedValue prototype(ExecutionEngine *); @@ -417,7 +417,7 @@ void NodeImpl::release() document->release(); } -ReturnedValue NodePrototype::method_get_nodeName(SimpleCallContext *ctx) +ReturnedValue NodePrototype::method_get_nodeName(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -442,7 +442,7 @@ ReturnedValue NodePrototype::method_get_nodeName(SimpleCallContext *ctx) return Encode(ctx->engine->newString(name)); } -ReturnedValue NodePrototype::method_get_nodeValue(SimpleCallContext *ctx) +ReturnedValue NodePrototype::method_get_nodeValue(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -461,7 +461,7 @@ ReturnedValue NodePrototype::method_get_nodeValue(SimpleCallContext *ctx) return Encode(ctx->engine->newString(r->d->data)); } -ReturnedValue NodePrototype::method_get_nodeType(SimpleCallContext *ctx) +ReturnedValue NodePrototype::method_get_nodeType(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -471,7 +471,7 @@ ReturnedValue NodePrototype::method_get_nodeType(SimpleCallContext *ctx) return Encode(r->d->type); } -ReturnedValue NodePrototype::method_get_parentNode(SimpleCallContext *ctx) +ReturnedValue NodePrototype::method_get_parentNode(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -486,7 +486,7 @@ ReturnedValue NodePrototype::method_get_parentNode(SimpleCallContext *ctx) return Encode::null(); } -ReturnedValue NodePrototype::method_get_childNodes(SimpleCallContext *ctx) +ReturnedValue NodePrototype::method_get_childNodes(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -498,7 +498,7 @@ ReturnedValue NodePrototype::method_get_childNodes(SimpleCallContext *ctx) return NodeList::create(engine, r->d); } -ReturnedValue NodePrototype::method_get_firstChild(SimpleCallContext *ctx) +ReturnedValue NodePrototype::method_get_firstChild(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -513,7 +513,7 @@ ReturnedValue NodePrototype::method_get_firstChild(SimpleCallContext *ctx) return Node::create(engine, r->d->children.first()); } -ReturnedValue NodePrototype::method_get_lastChild(SimpleCallContext *ctx) +ReturnedValue NodePrototype::method_get_lastChild(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -528,7 +528,7 @@ ReturnedValue NodePrototype::method_get_lastChild(SimpleCallContext *ctx) return Node::create(engine, r->d->children.last()); } -ReturnedValue NodePrototype::method_get_previousSibling(SimpleCallContext *ctx) +ReturnedValue NodePrototype::method_get_previousSibling(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -552,7 +552,7 @@ ReturnedValue NodePrototype::method_get_previousSibling(SimpleCallContext *ctx) return Encode::null(); } -ReturnedValue NodePrototype::method_get_nextSibling(SimpleCallContext *ctx) +ReturnedValue NodePrototype::method_get_nextSibling(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -576,7 +576,7 @@ ReturnedValue NodePrototype::method_get_nextSibling(SimpleCallContext *ctx) return Encode::null(); } -ReturnedValue NodePrototype::method_get_attributes(SimpleCallContext *ctx) +ReturnedValue NodePrototype::method_get_attributes(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -670,7 +670,7 @@ ReturnedValue Attr::prototype(ExecutionEngine *engine) return d->attrPrototype.value(); } -ReturnedValue Attr::method_name(SimpleCallContext *ctx) +ReturnedValue Attr::method_name(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -681,7 +681,7 @@ ReturnedValue Attr::method_name(SimpleCallContext *ctx) return engine->toString(r->d->name); } -ReturnedValue Attr::method_value(SimpleCallContext *ctx) +ReturnedValue Attr::method_value(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -692,7 +692,7 @@ ReturnedValue Attr::method_value(SimpleCallContext *ctx) return engine->toString(r->d->data); } -ReturnedValue Attr::method_ownerElement(SimpleCallContext *ctx) +ReturnedValue Attr::method_ownerElement(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -703,7 +703,7 @@ ReturnedValue Attr::method_ownerElement(SimpleCallContext *ctx) return Node::create(engine, r->d->parent); } -ReturnedValue CharacterData::method_length(SimpleCallContext *ctx) +ReturnedValue CharacterData::method_length(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -730,7 +730,7 @@ ReturnedValue CharacterData::prototype(ExecutionEngine *v4) return d->characterDataPrototype.value(); } -ReturnedValue Text::method_isElementContentWhitespace(SimpleCallContext *ctx) +ReturnedValue Text::method_isElementContentWhitespace(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -739,7 +739,7 @@ ReturnedValue Text::method_isElementContentWhitespace(SimpleCallContext *ctx) return Encode(r->d->data.trimmed().isEmpty()); } -ReturnedValue Text::method_wholeText(SimpleCallContext *ctx) +ReturnedValue Text::method_wholeText(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -997,7 +997,7 @@ ReturnedValue NodeList::create(QV8Engine *engine, NodeImpl *data) return instance.asReturnedValue(); } -ReturnedValue Document::method_documentElement(SimpleCallContext *ctx) +ReturnedValue Document::method_documentElement(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -1008,7 +1008,7 @@ ReturnedValue Document::method_documentElement(SimpleCallContext *ctx) return Node::create(engine, static_cast<DocumentImpl *>(r->d)->root); } -ReturnedValue Document::method_xmlStandalone(SimpleCallContext *ctx) +ReturnedValue Document::method_xmlStandalone(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -1019,7 +1019,7 @@ ReturnedValue Document::method_xmlStandalone(SimpleCallContext *ctx) return Encode(static_cast<DocumentImpl *>(r->d)->isStandalone); } -ReturnedValue Document::method_xmlVersion(SimpleCallContext *ctx) +ReturnedValue Document::method_xmlVersion(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -1030,7 +1030,7 @@ ReturnedValue Document::method_xmlVersion(SimpleCallContext *ctx) return engine->toString(static_cast<DocumentImpl *>(r->d)->version); } -ReturnedValue Document::method_xmlEncoding(SimpleCallContext *ctx) +ReturnedValue Document::method_xmlEncoding(CallContext *ctx) { Scope scope(ctx); Scoped<Node> r(scope, ctx->callData->thisObject.as<Node>()); @@ -1671,18 +1671,18 @@ struct QQmlXMLHttpRequestCtor : public FunctionObject void setupProto(); - static ReturnedValue method_open(SimpleCallContext *ctx); - static ReturnedValue method_setRequestHeader(SimpleCallContext *ctx); - static ReturnedValue method_send(SimpleCallContext *ctx); - static ReturnedValue method_abort(SimpleCallContext *ctx); - static ReturnedValue method_getResponseHeader(SimpleCallContext *ctx); - static ReturnedValue method_getAllResponseHeaders(SimpleCallContext *ctx); + static ReturnedValue method_open(CallContext *ctx); + static ReturnedValue method_setRequestHeader(CallContext *ctx); + static ReturnedValue method_send(CallContext *ctx); + static ReturnedValue method_abort(CallContext *ctx); + static ReturnedValue method_getResponseHeader(CallContext *ctx); + static ReturnedValue method_getAllResponseHeaders(CallContext *ctx); - static ReturnedValue method_get_readyState(SimpleCallContext *ctx); - static ReturnedValue method_get_status(SimpleCallContext *ctx); - static ReturnedValue method_get_statusText(SimpleCallContext *ctx); - static ReturnedValue method_get_responseText(SimpleCallContext *ctx); - static ReturnedValue method_get_responseXML(SimpleCallContext *ctx); + static ReturnedValue method_get_readyState(CallContext *ctx); + static ReturnedValue method_get_status(CallContext *ctx); + static ReturnedValue method_get_statusText(CallContext *ctx); + static ReturnedValue method_get_responseText(CallContext *ctx); + static ReturnedValue method_get_responseXML(CallContext *ctx); Object *proto; @@ -1722,7 +1722,7 @@ void QQmlXMLHttpRequestCtor::setupProto() // XMLHttpRequest methods -ReturnedValue QQmlXMLHttpRequestCtor::method_open(SimpleCallContext *ctx) +ReturnedValue QQmlXMLHttpRequestCtor::method_open(CallContext *ctx) { Scope scope(ctx); Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); @@ -1772,7 +1772,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_open(SimpleCallContext *ctx) return r->open(meObject, method, url); } -ReturnedValue QQmlXMLHttpRequestCtor::method_setRequestHeader(SimpleCallContext *ctx) +ReturnedValue QQmlXMLHttpRequestCtor::method_setRequestHeader(CallContext *ctx) { Scope scope(ctx); Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); @@ -1819,7 +1819,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_setRequestHeader(SimpleCallContext return Encode::undefined(); } -ReturnedValue QQmlXMLHttpRequestCtor::method_send(SimpleCallContext *ctx) +ReturnedValue QQmlXMLHttpRequestCtor::method_send(CallContext *ctx) { Scope scope(ctx); Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); @@ -1841,7 +1841,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_send(SimpleCallContext *ctx) return r->send(meObject, data); } -ReturnedValue QQmlXMLHttpRequestCtor::method_abort(SimpleCallContext *ctx) +ReturnedValue QQmlXMLHttpRequestCtor::method_abort(CallContext *ctx) { Scope scope(ctx); Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); @@ -1853,7 +1853,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_abort(SimpleCallContext *ctx) return r->abort(meObject); } -ReturnedValue QQmlXMLHttpRequestCtor::method_getResponseHeader(SimpleCallContext *ctx) +ReturnedValue QQmlXMLHttpRequestCtor::method_getResponseHeader(CallContext *ctx) { Scope scope(ctx); Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); @@ -1874,7 +1874,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_getResponseHeader(SimpleCallContext return engine->toString(r->header(ctx->callData->args[0].toQStringNoThrow())); } -ReturnedValue QQmlXMLHttpRequestCtor::method_getAllResponseHeaders(SimpleCallContext *ctx) +ReturnedValue QQmlXMLHttpRequestCtor::method_getAllResponseHeaders(CallContext *ctx) { Scope scope(ctx); Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); @@ -1896,7 +1896,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_getAllResponseHeaders(SimpleCallCon } // XMLHttpRequest properties -ReturnedValue QQmlXMLHttpRequestCtor::method_get_readyState(SimpleCallContext *ctx) +ReturnedValue QQmlXMLHttpRequestCtor::method_get_readyState(CallContext *ctx) { Scope scope(ctx); Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); @@ -1907,7 +1907,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_get_readyState(SimpleCallContext *c return Encode(r->readyState()); } -ReturnedValue QQmlXMLHttpRequestCtor::method_get_status(SimpleCallContext *ctx) +ReturnedValue QQmlXMLHttpRequestCtor::method_get_status(CallContext *ctx) { Scope scope(ctx); Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); @@ -1925,7 +1925,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_get_status(SimpleCallContext *ctx) return Encode(r->replyStatus()); } -ReturnedValue QQmlXMLHttpRequestCtor::method_get_statusText(SimpleCallContext *ctx) +ReturnedValue QQmlXMLHttpRequestCtor::method_get_statusText(CallContext *ctx) { Scope scope(ctx); Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); @@ -1945,7 +1945,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_get_statusText(SimpleCallContext *c return engine->toString(r->replyStatusText()); } -ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseText(SimpleCallContext *ctx) +ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseText(CallContext *ctx) { Scope scope(ctx); Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); @@ -1962,7 +1962,7 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseText(SimpleCallContext return engine->toString(r->responseBody()); } -ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseXML(SimpleCallContext *ctx) +ReturnedValue QQmlXMLHttpRequestCtor::method_get_responseXML(CallContext *ctx) { Scope scope(ctx); Scoped<QQmlXMLHttpRequestWrapper> w(scope, ctx->callData->thisObject.as<QQmlXMLHttpRequestWrapper>()); diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index adbd4da0eb..c80a742af0 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -158,7 +158,7 @@ QV4::QtObject::QtObject(ExecutionEngine *v4, QQmlEngine *qmlEngine) \qmlmethod bool Qt::isQtObject(object) Returns true if \c object is a valid reference to a Qt or QML object, otherwise false. */ -ReturnedValue QtObject::method_isQtObject(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_isQtObject(QV4::CallContext *ctx) { if (ctx->callData->argc == 0) return QV4::Encode(false); @@ -172,7 +172,7 @@ ReturnedValue QtObject::method_isQtObject(QV4::SimpleCallContext *ctx) Returns a color with the specified \c red, \c green, \c blue and \c alpha components. All components should be in the range 0-1 inclusive. */ -ReturnedValue QtObject::method_rgba(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_rgba(QV4::CallContext *ctx) { int argCount = ctx->callData->argc; if (argCount < 3 || argCount > 4) @@ -201,7 +201,7 @@ ReturnedValue QtObject::method_rgba(QV4::SimpleCallContext *ctx) Returns a color with the specified \c hue, \c saturation, \c lightness and \c alpha components. All components should be in the range 0-1 inclusive. */ -ReturnedValue QtObject::method_hsla(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_hsla(QV4::CallContext *ctx) { int argCount = ctx->callData->argc; if (argCount < 3 || argCount > 4) @@ -232,7 +232,7 @@ may be either color values or string values. If a string value is supplied it must be convertible to a color, as described for the \l{colorbasictypedocs}{color} basic type. */ -ReturnedValue QtObject::method_colorEqual(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_colorEqual(QV4::CallContext *ctx) { if (ctx->callData->argc != 2) V4THROW_ERROR("Qt.colorEqual(): Invalid arguments"); @@ -272,7 +272,7 @@ Returns a \c rect with the top-left corner at \c x, \c y and the specified \c wi The returned object has \c x, \c y, \c width and \c height attributes with the given values. */ -ReturnedValue QtObject::method_rect(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_rect(QV4::CallContext *ctx) { if (ctx->callData->argc != 4) V4THROW_ERROR("Qt.rect(): Invalid arguments"); @@ -289,7 +289,7 @@ ReturnedValue QtObject::method_rect(QV4::SimpleCallContext *ctx) \qmlmethod point Qt::point(int x, int y) Returns a Point with the specified \c x and \c y coordinates. */ -ReturnedValue QtObject::method_point(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_point(QV4::CallContext *ctx) { if (ctx->callData->argc != 2) V4THROW_ERROR("Qt.point(): Invalid arguments"); @@ -304,7 +304,7 @@ ReturnedValue QtObject::method_point(QV4::SimpleCallContext *ctx) \qmlmethod Qt::size(int width, int height) Returns a Size with the specified \c width and \c height. */ -ReturnedValue QtObject::method_size(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_size(QV4::CallContext *ctx) { if (ctx->callData->argc != 2) V4THROW_ERROR("Qt.size(): Invalid arguments"); @@ -323,7 +323,7 @@ key-value pairs where valid keys are the \l{fontbasictypedocs}{font} type's subproperty names, and the values are valid values for each subproperty. Invalid keys will be ignored. */ -ReturnedValue QtObject::method_font(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_font(QV4::CallContext *ctx) { if (ctx->callData->argc != 1 || !ctx->callData->args[0].isObject()) V4THROW_ERROR("Qt.font(): Invalid arguments"); @@ -342,7 +342,7 @@ ReturnedValue QtObject::method_font(QV4::SimpleCallContext *ctx) \qmlmethod Qt::vector2d(real x, real y) Returns a Vector2D with the specified \c x and \c y. */ -ReturnedValue QtObject::method_vector2d(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_vector2d(QV4::CallContext *ctx) { if (ctx->callData->argc != 2) V4THROW_ERROR("Qt.vector2d(): Invalid arguments"); @@ -360,7 +360,7 @@ ReturnedValue QtObject::method_vector2d(QV4::SimpleCallContext *ctx) \qmlmethod Qt::vector3d(real x, real y, real z) Returns a Vector3D with the specified \c x, \c y and \c z. */ -ReturnedValue QtObject::method_vector3d(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_vector3d(QV4::CallContext *ctx) { if (ctx->callData->argc != 3) V4THROW_ERROR("Qt.vector3d(): Invalid arguments"); @@ -379,7 +379,7 @@ ReturnedValue QtObject::method_vector3d(QV4::SimpleCallContext *ctx) \qmlmethod Qt::vector4d(real x, real y, real z, real w) Returns a Vector4D with the specified \c x, \c y, \c z and \c w. */ -ReturnedValue QtObject::method_vector4d(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_vector4d(QV4::CallContext *ctx) { if (ctx->callData->argc != 4) V4THROW_ERROR("Qt.vector4d(): Invalid arguments"); @@ -399,7 +399,7 @@ ReturnedValue QtObject::method_vector4d(QV4::SimpleCallContext *ctx) \qmlmethod Qt::quaternion(real scalar, real x, real y, real z) Returns a Quaternion with the specified \c scalar, \c x, \c y, and \c z. */ -ReturnedValue QtObject::method_quaternion(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_quaternion(QV4::CallContext *ctx) { if (ctx->callData->argc != 4) V4THROW_ERROR("Qt.quaternion(): Invalid arguments"); @@ -422,7 +422,7 @@ Alternatively, the function may be called with a single argument where that argument is a JavaScript array which contains the sixteen matrix values. */ -ReturnedValue QtObject::method_matrix4x4(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_matrix4x4(QV4::CallContext *ctx) { QV8Engine *v8engine = ctx->engine->v8Engine; @@ -473,7 +473,7 @@ by factor and converts the color back to RGB. If \c factor is not supplied, returns a color 50% lighter than \c baseColor (factor 1.5). */ -ReturnedValue QtObject::method_lighter(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_lighter(QV4::CallContext *ctx) { if (ctx->callData->argc != 1 && ctx->callData->argc != 2) V4THROW_ERROR("Qt.lighter(): Invalid arguments"); @@ -512,7 +512,7 @@ by factor and converts the color back to RGB. If \c factor is not supplied, returns a color 50% darker than \c baseColor (factor 2.0). */ -ReturnedValue QtObject::method_darker(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_darker(QV4::CallContext *ctx) { if (ctx->callData->argc != 1 && ctx->callData->argc != 2) V4THROW_ERROR("Qt.darker(): Invalid arguments"); @@ -560,7 +560,7 @@ ReturnedValue QtObject::method_darker(QV4::SimpleCallContext *ctx) Tint is most useful when a subtle change is intended to be conveyed due to some event; you can then use tinting to more effectively tune the visible color. */ -ReturnedValue QtObject::method_tint(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_tint(QV4::CallContext *ctx) { if (ctx->callData->argc != 2) V4THROW_ERROR("Qt.tint(): Invalid arguments"); @@ -610,7 +610,7 @@ If \a format is not specified, \a date is formatted using \sa Locale */ -ReturnedValue QtObject::method_formatDate(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_formatDate(QV4::CallContext *ctx) { if (ctx->callData->argc < 1 || ctx->callData->argc > 2) V4THROW_ERROR("Qt.formatDate(): Invalid arguments"); @@ -655,7 +655,7 @@ If \a format is not specified, \a time is formatted using \sa Locale */ -ReturnedValue QtObject::method_formatTime(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_formatTime(QV4::CallContext *ctx) { if (ctx->callData->argc < 1 || ctx->callData->argc > 2) V4THROW_ERROR("Qt.formatTime(): Invalid arguments"); @@ -781,7 +781,7 @@ with the \a format values below to produce the following results: \sa Locale */ -ReturnedValue QtObject::method_formatDateTime(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_formatDateTime(QV4::CallContext *ctx) { if (ctx->callData->argc < 1 || ctx->callData->argc > 2) V4THROW_ERROR("Qt.formatDateTime(): Invalid arguments"); @@ -815,7 +815,7 @@ ReturnedValue QtObject::method_formatDateTime(QV4::SimpleCallContext *ctx) \qmlmethod bool Qt::openUrlExternally(url target) Attempts to open the specified \c target url in an external application, based on the user's desktop preferences. Returns true if it succeeds, and false otherwise. */ -ReturnedValue QtObject::method_openUrlExternally(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_openUrlExternally(QV4::CallContext *ctx) { if (ctx->callData->argc != 1) return QV4::Encode(false); @@ -830,7 +830,7 @@ ReturnedValue QtObject::method_openUrlExternally(QV4::SimpleCallContext *ctx) \qmlmethod url Qt::resolvedUrl(url url) Returns \a url resolved relative to the URL of the caller. */ -ReturnedValue QtObject::method_resolvedUrl(QV4::SimpleCallContext *ctx) +ReturnedValue QtObject::method_resolvedUrl(QV4::CallContext *ctx) { QV8Engine *v8engine = ctx->engine->v8Engine; @@ -853,7 +853,7 @@ ReturnedValue QtObject::method_resolvedUrl(QV4::SimpleCallContext *ctx) \qmlmethod list<string> Qt::fontFamilies() Returns a list of the font families available to the application. */ -ReturnedValue QtObject::method_fontFamilies(SimpleCallContext *ctx) +ReturnedValue QtObject::method_fontFamilies(CallContext *ctx) { if (ctx->callData->argc != 0) V4THROW_ERROR("Qt.fontFamilies(): Invalid arguments"); @@ -866,7 +866,7 @@ ReturnedValue QtObject::method_fontFamilies(SimpleCallContext *ctx) \qmlmethod string Qt::md5(data) Returns a hex string of the md5 hash of \c data. */ -ReturnedValue QtObject::method_md5(SimpleCallContext *ctx) +ReturnedValue QtObject::method_md5(CallContext *ctx) { if (ctx->callData->argc != 1) V4THROW_ERROR("Qt.md5(): Invalid arguments"); @@ -880,7 +880,7 @@ ReturnedValue QtObject::method_md5(SimpleCallContext *ctx) \qmlmethod string Qt::btoa(data) Binary to ASCII - this function returns a base64 encoding of \c data. */ -ReturnedValue QtObject::method_btoa(SimpleCallContext *ctx) +ReturnedValue QtObject::method_btoa(CallContext *ctx) { if (ctx->callData->argc != 1) V4THROW_ERROR("Qt.btoa(): Invalid arguments"); @@ -894,7 +894,7 @@ ReturnedValue QtObject::method_btoa(SimpleCallContext *ctx) \qmlmethod string Qt::atob(data) ASCII to binary - this function returns a base64 decoding of \c data. */ -ReturnedValue QtObject::method_atob(SimpleCallContext *ctx) +ReturnedValue QtObject::method_atob(CallContext *ctx) { if (ctx->callData->argc != 1) V4THROW_ERROR("Qt.atob(): Invalid arguments"); @@ -911,7 +911,7 @@ Within the \l {Prototyping with qmlscene}, this causes the launcher application to quit a C++ application when this method is called, connect the QQmlEngine::quit() signal to the QCoreApplication::quit() slot. */ -ReturnedValue QtObject::method_quit(SimpleCallContext *ctx) +ReturnedValue QtObject::method_quit(CallContext *ctx) { QV8Engine *v8engine = ctx->engine->v8Engine; @@ -943,7 +943,7 @@ If this is the case, consider using \l{QtQml::Qt::createComponent()}{Qt.createCo See \l {Dynamic QML Object Creation from JavaScript} for more information on using this function. */ -ReturnedValue QtObject::method_createQmlObject(SimpleCallContext *ctx) +ReturnedValue QtObject::method_createQmlObject(CallContext *ctx) { Scope scope(ctx); if (ctx->callData->argc < 2 || ctx->callData->argc > 3) @@ -1075,7 +1075,7 @@ See \l {Dynamic QML Object Creation from JavaScript} for more information on usi To create a QML object from an arbitrary string of QML (instead of a file), use \l{QtQml::Qt::createQmlObject()}{Qt.createQmlObject()}. */ -ReturnedValue QtObject::method_createComponent(SimpleCallContext *ctx) +ReturnedValue QtObject::method_createComponent(CallContext *ctx) { if (ctx->callData->argc < 1 || ctx->callData->argc > 3) return ctx->throwError(QStringLiteral("Qt.createComponent(): Invalid arguments")); @@ -1159,7 +1159,7 @@ ReturnedValue QtObject::method_createComponent(SimpleCallContext *ctx) \sa QtQuick::Locale */ -ReturnedValue QtObject::method_locale(SimpleCallContext *ctx) +ReturnedValue QtObject::method_locale(CallContext *ctx) { QString code; if (ctx->callData->argc > 1) @@ -1253,7 +1253,7 @@ DEFINE_MANAGED_VTABLE(BindingFunction); \since 5.0 */ -ReturnedValue QtObject::method_binding(SimpleCallContext *ctx) +ReturnedValue QtObject::method_binding(CallContext *ctx) { if (ctx->callData->argc != 1) V4THROW_ERROR("binding() requires 1 argument"); @@ -1265,7 +1265,7 @@ ReturnedValue QtObject::method_binding(SimpleCallContext *ctx) } -ReturnedValue QtObject::method_get_platform(SimpleCallContext *ctx) +ReturnedValue QtObject::method_get_platform(CallContext *ctx) { // ### inefficient. Should be just a value based getter Object *o = ctx->callData->thisObject.asObject(); @@ -1282,7 +1282,7 @@ ReturnedValue QtObject::method_get_platform(SimpleCallContext *ctx) return QV4::QObjectWrapper::wrap(ctx->engine, qt->m_platform); } -ReturnedValue QtObject::method_get_application(SimpleCallContext *ctx) +ReturnedValue QtObject::method_get_application(CallContext *ctx) { // ### inefficient. Should be just a value based getter Object *o = ctx->callData->thisObject.asObject(); @@ -1300,7 +1300,7 @@ ReturnedValue QtObject::method_get_application(SimpleCallContext *ctx) } #ifndef QT_NO_IM -ReturnedValue QtObject::method_get_inputMethod(SimpleCallContext *ctx) +ReturnedValue QtObject::method_get_inputMethod(CallContext *ctx) { QObject *o = QQml_guiProvider()->inputMethod(); QQmlEngine::setObjectOwnership(o, QQmlEngine::CppOwnership); @@ -1364,7 +1364,7 @@ static QString jsStack(QV4::ExecutionEngine *engine) { return stack; } -static QV4::ReturnedValue writeToConsole(ConsoleLogTypes logType, SimpleCallContext *ctx, +static QV4::ReturnedValue writeToConsole(ConsoleLogTypes logType, CallContext *ctx, bool printStack = false) { QString result; @@ -1406,12 +1406,12 @@ static QV4::ReturnedValue writeToConsole(ConsoleLogTypes logType, SimpleCallCont return QV4::Encode::undefined(); } -QV4::ReturnedValue ConsoleObject::method_error(SimpleCallContext *ctx) +QV4::ReturnedValue ConsoleObject::method_error(CallContext *ctx) { return writeToConsole(Error, ctx); } -QV4::ReturnedValue ConsoleObject::method_log(SimpleCallContext *ctx) +QV4::ReturnedValue ConsoleObject::method_log(CallContext *ctx) { //console.log //console.debug @@ -1420,7 +1420,7 @@ QV4::ReturnedValue ConsoleObject::method_log(SimpleCallContext *ctx) return writeToConsole(Log, ctx); } -QV4::ReturnedValue ConsoleObject::method_profile(SimpleCallContext *ctx) +QV4::ReturnedValue ConsoleObject::method_profile(CallContext *ctx) { //DeclarativeDebugTrace cannot handle nested profiling //although v8 can handle several profiling at once, @@ -1443,7 +1443,7 @@ QV4::ReturnedValue ConsoleObject::method_profile(SimpleCallContext *ctx) return QV4::Encode::undefined(); } -QV4::ReturnedValue ConsoleObject::method_profileEnd(SimpleCallContext *ctx) +QV4::ReturnedValue ConsoleObject::method_profileEnd(CallContext *ctx) { //DeclarativeDebugTrace cannot handle nested profiling //although v8 can handle several profiling at once, @@ -1471,7 +1471,7 @@ QV4::ReturnedValue ConsoleObject::method_profileEnd(SimpleCallContext *ctx) return QV4::Encode::undefined(); } -QV4::ReturnedValue ConsoleObject::method_time(SimpleCallContext *ctx) +QV4::ReturnedValue ConsoleObject::method_time(CallContext *ctx) { if (ctx->callData->argc != 1) V4THROW_ERROR("console.time(): Invalid arguments"); @@ -1483,7 +1483,7 @@ QV4::ReturnedValue ConsoleObject::method_time(SimpleCallContext *ctx) return QV4::Encode::undefined(); } -QV4::ReturnedValue ConsoleObject::method_timeEnd(SimpleCallContext *ctx) +QV4::ReturnedValue ConsoleObject::method_timeEnd(CallContext *ctx) { if (ctx->callData->argc != 1) V4THROW_ERROR("console.time(): Invalid arguments"); @@ -1499,7 +1499,7 @@ QV4::ReturnedValue ConsoleObject::method_timeEnd(SimpleCallContext *ctx) return QV4::Encode::undefined(); } -QV4::ReturnedValue ConsoleObject::method_count(SimpleCallContext *ctx) +QV4::ReturnedValue ConsoleObject::method_count(CallContext *ctx) { // first argument: name to print. Ignore any additional arguments QString name; @@ -1523,7 +1523,7 @@ QV4::ReturnedValue ConsoleObject::method_count(SimpleCallContext *ctx) return QV4::Encode::undefined(); } -QV4::ReturnedValue ConsoleObject::method_trace(SimpleCallContext *ctx) +QV4::ReturnedValue ConsoleObject::method_trace(CallContext *ctx) { if (ctx->callData->argc != 0) V4THROW_ERROR("console.trace(): Invalid arguments"); @@ -1540,12 +1540,12 @@ QV4::ReturnedValue ConsoleObject::method_trace(SimpleCallContext *ctx) return QV4::Encode::undefined(); } -QV4::ReturnedValue ConsoleObject::method_warn(SimpleCallContext *ctx) +QV4::ReturnedValue ConsoleObject::method_warn(CallContext *ctx) { return writeToConsole(Warn, ctx); } -QV4::ReturnedValue ConsoleObject::method_assert(SimpleCallContext *ctx) +QV4::ReturnedValue ConsoleObject::method_assert(CallContext *ctx) { if (ctx->callData->argc == 0) V4THROW_ERROR("console.assert(): Missing argument"); @@ -1572,7 +1572,7 @@ QV4::ReturnedValue ConsoleObject::method_assert(SimpleCallContext *ctx) return QV4::Encode::undefined(); } -QV4::ReturnedValue ConsoleObject::method_exception(SimpleCallContext *ctx) +QV4::ReturnedValue ConsoleObject::method_exception(CallContext *ctx) { if (ctx->callData->argc == 0) V4THROW_ERROR("console.exception(): Missing argument"); @@ -1630,7 +1630,7 @@ void QV4::GlobalExtensions::init(QQmlEngine *qmlEngine, Object *globalObject) \sa {Internationalization and Localization with Qt Quick} */ -ReturnedValue GlobalExtensions::method_qsTranslate(SimpleCallContext *ctx) +ReturnedValue GlobalExtensions::method_qsTranslate(CallContext *ctx) { if (ctx->callData->argc < 2) V4THROW_ERROR("qsTranslate() requires at least two arguments"); @@ -1686,7 +1686,7 @@ ReturnedValue GlobalExtensions::method_qsTranslate(SimpleCallContext *ctx) \sa {Internationalization and Localization with Qt Quick} */ -ReturnedValue GlobalExtensions::method_qsTranslateNoOp(SimpleCallContext *ctx) +ReturnedValue GlobalExtensions::method_qsTranslateNoOp(CallContext *ctx) { if (ctx->callData->argc < 2) return QV4::Encode::undefined(); @@ -1710,7 +1710,7 @@ ReturnedValue GlobalExtensions::method_qsTranslateNoOp(SimpleCallContext *ctx) \sa {Internationalization and Localization with Qt Quick} */ -ReturnedValue GlobalExtensions::method_qsTr(SimpleCallContext *ctx) +ReturnedValue GlobalExtensions::method_qsTr(CallContext *ctx) { if (ctx->callData->argc < 1) V4THROW_ERROR("qsTr() requires at least one argument"); @@ -1764,7 +1764,7 @@ ReturnedValue GlobalExtensions::method_qsTr(SimpleCallContext *ctx) \sa {Internationalization and Localization with Qt Quick} */ -ReturnedValue GlobalExtensions::method_qsTrNoOp(SimpleCallContext *ctx) +ReturnedValue GlobalExtensions::method_qsTrNoOp(CallContext *ctx) { if (ctx->callData->argc < 1) return QV4::Encode::undefined(); @@ -1801,7 +1801,7 @@ ReturnedValue GlobalExtensions::method_qsTrNoOp(SimpleCallContext *ctx) \sa QT_TRID_NOOP, {Internationalization and Localization with Qt Quick} */ -ReturnedValue GlobalExtensions::method_qsTrId(SimpleCallContext *ctx) +ReturnedValue GlobalExtensions::method_qsTrId(CallContext *ctx) { if (ctx->callData->argc < 1) V4THROW_ERROR("qsTrId() requires at least one argument"); @@ -1833,7 +1833,7 @@ ReturnedValue GlobalExtensions::method_qsTrId(SimpleCallContext *ctx) \sa qsTrId(), {Internationalization and Localization with Qt Quick} */ -ReturnedValue GlobalExtensions::method_qsTrIdNoOp(SimpleCallContext *ctx) +ReturnedValue GlobalExtensions::method_qsTrIdNoOp(CallContext *ctx) { if (ctx->callData->argc < 1) return QV4::Encode::undefined(); @@ -1842,7 +1842,7 @@ ReturnedValue GlobalExtensions::method_qsTrIdNoOp(SimpleCallContext *ctx) #endif // QT_NO_TRANSLATION -QV4::ReturnedValue GlobalExtensions::method_gc(SimpleCallContext *ctx) +QV4::ReturnedValue GlobalExtensions::method_gc(CallContext *ctx) { ctx->engine->memoryManager->runGC(); @@ -1851,7 +1851,7 @@ QV4::ReturnedValue GlobalExtensions::method_gc(SimpleCallContext *ctx) -ReturnedValue GlobalExtensions::method_string_arg(SimpleCallContext *ctx) +ReturnedValue GlobalExtensions::method_string_arg(CallContext *ctx) { if (ctx->callData->argc != 1) V4THROW_ERROR("String.arg(): Invalid arguments"); diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h index 070796f03c..90536c09dd 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h +++ b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h @@ -68,41 +68,41 @@ struct QtObject : Object Q_MANAGED QtObject(ExecutionEngine *v4, QQmlEngine *qmlEngine); - static ReturnedValue method_isQtObject(SimpleCallContext *ctx); - static ReturnedValue method_rgba(SimpleCallContext *ctx); - static ReturnedValue method_hsla(SimpleCallContext *ctx); - static ReturnedValue method_colorEqual(SimpleCallContext *ctx); - static ReturnedValue method_font(SimpleCallContext *ctx); - static ReturnedValue method_rect(SimpleCallContext *ctx); - static ReturnedValue method_point(SimpleCallContext *ctx); - static ReturnedValue method_size(SimpleCallContext *ctx); - static ReturnedValue method_vector2d(SimpleCallContext *ctx); - static ReturnedValue method_vector3d(SimpleCallContext *ctx); - static ReturnedValue method_vector4d(SimpleCallContext *ctx); - static ReturnedValue method_quaternion(SimpleCallContext *ctx); - static ReturnedValue method_matrix4x4(SimpleCallContext *ctx); - static ReturnedValue method_lighter(SimpleCallContext *ctx); - static ReturnedValue method_darker(SimpleCallContext *ctx); - static ReturnedValue method_tint(SimpleCallContext *ctx); - static ReturnedValue method_formatDate(SimpleCallContext *ctx); - static ReturnedValue method_formatTime(SimpleCallContext *ctx); - static ReturnedValue method_formatDateTime(SimpleCallContext *ctx); - static ReturnedValue method_openUrlExternally(SimpleCallContext *ctx); - static ReturnedValue method_fontFamilies(SimpleCallContext *ctx); - static ReturnedValue method_md5(SimpleCallContext *ctx); - static ReturnedValue method_btoa(SimpleCallContext *ctx); - static ReturnedValue method_atob(SimpleCallContext *ctx); - static ReturnedValue method_quit(SimpleCallContext *ctx); - static ReturnedValue method_resolvedUrl(SimpleCallContext *ctx); - static ReturnedValue method_createQmlObject(SimpleCallContext *ctx); - static ReturnedValue method_createComponent(SimpleCallContext *ctx); - static ReturnedValue method_locale(SimpleCallContext *ctx); - static ReturnedValue method_binding(SimpleCallContext *ctx); - - static ReturnedValue method_get_platform(SimpleCallContext *ctx); - static ReturnedValue method_get_application(SimpleCallContext *ctx); + static ReturnedValue method_isQtObject(CallContext *ctx); + static ReturnedValue method_rgba(CallContext *ctx); + static ReturnedValue method_hsla(CallContext *ctx); + static ReturnedValue method_colorEqual(CallContext *ctx); + static ReturnedValue method_font(CallContext *ctx); + static ReturnedValue method_rect(CallContext *ctx); + static ReturnedValue method_point(CallContext *ctx); + static ReturnedValue method_size(CallContext *ctx); + static ReturnedValue method_vector2d(CallContext *ctx); + static ReturnedValue method_vector3d(CallContext *ctx); + static ReturnedValue method_vector4d(CallContext *ctx); + static ReturnedValue method_quaternion(CallContext *ctx); + static ReturnedValue method_matrix4x4(CallContext *ctx); + static ReturnedValue method_lighter(CallContext *ctx); + static ReturnedValue method_darker(CallContext *ctx); + static ReturnedValue method_tint(CallContext *ctx); + static ReturnedValue method_formatDate(CallContext *ctx); + static ReturnedValue method_formatTime(CallContext *ctx); + static ReturnedValue method_formatDateTime(CallContext *ctx); + static ReturnedValue method_openUrlExternally(CallContext *ctx); + static ReturnedValue method_fontFamilies(CallContext *ctx); + static ReturnedValue method_md5(CallContext *ctx); + static ReturnedValue method_btoa(CallContext *ctx); + static ReturnedValue method_atob(CallContext *ctx); + static ReturnedValue method_quit(CallContext *ctx); + static ReturnedValue method_resolvedUrl(CallContext *ctx); + static ReturnedValue method_createQmlObject(CallContext *ctx); + static ReturnedValue method_createComponent(CallContext *ctx); + static ReturnedValue method_locale(CallContext *ctx); + static ReturnedValue method_binding(CallContext *ctx); + + static ReturnedValue method_get_platform(CallContext *ctx); + static ReturnedValue method_get_application(CallContext *ctx); #ifndef QT_NO_IM - static ReturnedValue method_get_inputMethod(SimpleCallContext *ctx); + static ReturnedValue method_get_inputMethod(CallContext *ctx); #endif QObject *m_platform; @@ -113,17 +113,17 @@ struct ConsoleObject : Object { ConsoleObject(ExecutionEngine *v4); - static ReturnedValue method_error(SimpleCallContext *ctx); - static ReturnedValue method_log(SimpleCallContext *ctx); - static ReturnedValue method_profile(SimpleCallContext *ctx); - static ReturnedValue method_profileEnd(SimpleCallContext *ctx); - static ReturnedValue method_time(SimpleCallContext *ctx); - static ReturnedValue method_timeEnd(SimpleCallContext *ctx); - static ReturnedValue method_count(SimpleCallContext *ctx); - static ReturnedValue method_trace(SimpleCallContext *ctx); - static ReturnedValue method_warn(SimpleCallContext *ctx); - static ReturnedValue method_assert(SimpleCallContext *ctx); - static ReturnedValue method_exception(SimpleCallContext *ctx); + static ReturnedValue method_error(CallContext *ctx); + static ReturnedValue method_log(CallContext *ctx); + static ReturnedValue method_profile(CallContext *ctx); + static ReturnedValue method_profileEnd(CallContext *ctx); + static ReturnedValue method_time(CallContext *ctx); + static ReturnedValue method_timeEnd(CallContext *ctx); + static ReturnedValue method_count(CallContext *ctx); + static ReturnedValue method_trace(CallContext *ctx); + static ReturnedValue method_warn(CallContext *ctx); + static ReturnedValue method_assert(CallContext *ctx); + static ReturnedValue method_exception(CallContext *ctx); }; @@ -131,17 +131,17 @@ struct GlobalExtensions { static void init(QQmlEngine *qmlEngine, Object *globalObject); #ifndef QT_NO_TRANSLATION - static ReturnedValue method_qsTranslate(SimpleCallContext *ctx); - static ReturnedValue method_qsTranslateNoOp(SimpleCallContext *ctx); - static ReturnedValue method_qsTr(SimpleCallContext *ctx); - static ReturnedValue method_qsTrNoOp(SimpleCallContext *ctx); - static ReturnedValue method_qsTrId(SimpleCallContext *ctx); - static ReturnedValue method_qsTrIdNoOp(SimpleCallContext *ctx); + static ReturnedValue method_qsTranslate(CallContext *ctx); + static ReturnedValue method_qsTranslateNoOp(CallContext *ctx); + static ReturnedValue method_qsTr(CallContext *ctx); + static ReturnedValue method_qsTrNoOp(CallContext *ctx); + static ReturnedValue method_qsTrId(CallContext *ctx); + static ReturnedValue method_qsTrIdNoOp(CallContext *ctx); #endif - static ReturnedValue method_gc(SimpleCallContext *ctx); + static ReturnedValue method_gc(CallContext *ctx); // on String:prototype - static ReturnedValue method_string_arg(SimpleCallContext *ctx); + static ReturnedValue method_string_arg(CallContext *ctx); }; |