diff options
author | Jan Arve Saether <jan-arve.saether@qt.io> | 2017-06-26 18:38:27 +0200 |
---|---|---|
committer | Jan Arve Saether <jan-arve.saether@qt.io> | 2017-07-11 16:44:33 +0200 |
commit | b6e6e737f1a4a7e48989a6a036e25c238304802f (patch) | |
tree | 8d4b5940b92ad1fc94e46c1742acd9355e19e1d4 /src/particles/qquickv4particledata.cpp | |
parent | d5b3f5da9cfa90fc43f29f3bdeec01884a47d6ca (diff) | |
parent | 4beee1a6dcc1be57aa6fb2a175dadc6ff298545d (diff) |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Conflicts:
examples/quick/shared/LauncherList.qml
src/quick/items/qquickevents.cpp
src/quick/items/qquickevents_p_p.h
src/quick/items/qquickwindow.cpp
tests/auto/quick/touchmouse/tst_touchmouse.cpp
Change-Id: Id692d291455093fc72db61f1b854f3fc9190267b
Diffstat (limited to 'src/particles/qquickv4particledata.cpp')
-rw-r--r-- | src/particles/qquickv4particledata.cpp | 107 |
1 files changed, 48 insertions, 59 deletions
diff --git a/src/particles/qquickv4particledata.cpp b/src/particles/qquickv4particledata.cpp index 967652f31a..e8376f1c27 100644 --- a/src/particles/qquickv4particledata.cpp +++ b/src/particles/qquickv4particledata.cpp @@ -296,123 +296,112 @@ public: QV4::PersistentValue proto; }; -static QV4::ReturnedValue particleData_discard(QV4::CallContext *ctx) +static void particleData_discard(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) { - QV4::Scope scope(ctx); - QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); + QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); if (!r || !r->d()->datum) - return ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); + RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object"))); r->d()->datum->lifeSpan = 0; //Don't kill(), because it could still be in the middle of being created - return QV4::Encode::undefined(); + RETURN_RESULT(QV4::Encode::undefined()); } -static QV4::ReturnedValue particleData_lifeLeft(QV4::CallContext *ctx) +static void particleData_lifeLeft(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) { - QV4::Scope scope(ctx); - QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); + QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); if (!r || !r->d()->datum) - return ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); + RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object"))); - return QV4::Encode(r->d()->datum->lifeLeft(r->d()->particleSystem)); + RETURN_RESULT(QV4::Encode(r->d()->datum->lifeLeft(r->d()->particleSystem))); } -static QV4::ReturnedValue particleData_curSize(QV4::CallContext *ctx) +static void particleData_curSize(const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) { - QV4::Scope scope(ctx); - QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); + QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); if (!r || !r->d()->datum) - return ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); + RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object"))); - return QV4::Encode(r->d()->datum->curSize(r->d()->particleSystem)); + RETURN_RESULT(QV4::Encode(r->d()->datum->curSize(r->d()->particleSystem))); } -#define COLOR_GETTER_AND_SETTER(VAR, NAME) static QV4::ReturnedValue particleData_get_ ## NAME (QV4::CallContext *ctx) \ +#define COLOR_GETTER_AND_SETTER(VAR, NAME) static void particleData_get_ ## NAME (const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) \ { \ - QV4::Scope scope(ctx); \ - QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \ + QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ if (!r || !r->d()->datum) \ - ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); \ + RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object"))); \ \ - return QV4::Encode((r->d()->datum->color. VAR )/255.0);\ + RETURN_RESULT(QV4::Encode((r->d()->datum->color. VAR )/255.0));\ }\ \ -static QV4::ReturnedValue particleData_set_ ## NAME (QV4::CallContext *ctx)\ +static void particleData_set_ ## NAME (const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData)\ {\ - QV4::Scope scope(ctx); \ - QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \ + QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ if (!r || !r->d()->datum)\ - ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object"));\ + RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object")));\ \ - double d = ctx->argc() ? ctx->args()[0].toNumber() : 0; \ + double d = callData->argc ? callData->args[0].toNumber() : 0; \ r->d()->datum->color. VAR = qMin(255, qMax(0, (int)::floor(d * 255.0)));\ - return QV4::Encode::undefined(); \ + RETURN_UNDEFINED(); \ } -#define SEMIBOOL_GETTER_AND_SETTER(VARIABLE) static QV4::ReturnedValue particleData_get_ ## VARIABLE (QV4::CallContext *ctx) \ +#define SEMIBOOL_GETTER_AND_SETTER(VARIABLE) static void particleData_get_ ## VARIABLE (const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) \ { \ - QV4::Scope scope(ctx); \ - QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \ + QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ if (!r || !r->d()->datum) \ - ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); \ + RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object"))); \ \ - return QV4::Encode(r->d()->datum-> VARIABLE);\ + RETURN_RESULT(QV4::Encode(r->d()->datum-> VARIABLE));\ }\ \ -static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\ +static void particleData_set_ ## VARIABLE (const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData)\ {\ - QV4::Scope scope(ctx); \ - QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \ + QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ if (!r || !r->d()->datum)\ - ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object"));\ + RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object")));\ \ - r->d()->datum-> VARIABLE = (ctx->argc() && ctx->args()[0].toBoolean()) ? 1.0 : 0.0;\ - return QV4::Encode::undefined(); \ + r->d()->datum-> VARIABLE = (callData->argc && callData->args[0].toBoolean()) ? 1.0 : 0.0;\ + RETURN_UNDEFINED(); \ } -#define FLOAT_GETTER_AND_SETTER(VARIABLE) static QV4::ReturnedValue particleData_get_ ## VARIABLE (QV4::CallContext *ctx) \ +#define FLOAT_GETTER_AND_SETTER(VARIABLE) static void particleData_get_ ## VARIABLE (const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) \ { \ - QV4::Scope scope(ctx); \ - QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \ + QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ if (!r || !r->d()->datum) \ - ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); \ + RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object"))); \ \ - return QV4::Encode(r->d()->datum-> VARIABLE);\ + RETURN_RESULT(QV4::Encode(r->d()->datum-> VARIABLE));\ }\ \ -static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\ +static void particleData_set_ ## VARIABLE (const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData)\ {\ - QV4::Scope scope(ctx); \ - QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \ + QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ if (!r || !r->d()->datum)\ - ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object"));\ + RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object")));\ \ - r->d()->datum-> VARIABLE = ctx->argc() ? ctx->args()[0].toNumber() : qt_qnan();\ - return QV4::Encode::undefined(); \ + r->d()->datum-> VARIABLE = callData->argc ? callData->args[0].toNumber() : qt_qnan();\ + RETURN_UNDEFINED(); \ } -#define FAKE_FLOAT_GETTER_AND_SETTER(VARIABLE, GETTER, SETTER) static QV4::ReturnedValue particleData_get_ ## VARIABLE (QV4::CallContext *ctx) \ +#define FAKE_FLOAT_GETTER_AND_SETTER(VARIABLE, GETTER, SETTER) static void particleData_get_ ## VARIABLE (const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData) \ { \ - QV4::Scope scope(ctx); \ - QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \ + QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ if (!r || !r->d()->datum) \ - ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); \ + RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object"))); \ \ - return QV4::Encode(r->d()->datum-> GETTER (r->d()->particleSystem));\ + RETURN_RESULT(QV4::Encode(r->d()->datum-> GETTER (r->d()->particleSystem)));\ }\ \ -static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\ +static void particleData_set_ ## VARIABLE (const QV4::BuiltinFunction *, QV4::Scope &scope, QV4::CallData *callData)\ {\ - QV4::Scope scope(ctx); \ - QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \ + QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ if (!r || !r->d()->datum)\ - ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object"));\ + RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object")));\ \ - r->d()->datum-> SETTER (ctx->argc() ? ctx->args()[0].toNumber() : qt_qnan(), r->d()->particleSystem);\ - return QV4::Encode::undefined(); \ + r->d()->datum-> SETTER (callData->argc ? callData->args[0].toNumber() : qt_qnan(), r->d()->particleSystem);\ + RETURN_UNDEFINED(); \ } #define REGISTER_ACCESSOR(PROTO, ENGINE, VARIABLE, NAME) \ |