diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-12-05 14:43:53 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2018-01-12 12:07:10 +0000 |
commit | a8fe0a497727fd6fb83f242d42e6afc089a56b88 (patch) | |
tree | ef1a463949236f50ffdb8db9ab64a41a74988414 | |
parent | 67bf3623bdad06b13607cd8be2217e58bd33ae7d (diff) |
Convert particles over to new calling convention for builtin functions
Change-Id: Id57417f4deba21917136edd6c10f2ad52c9f9fbb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r-- | src/particles/qquickv4particledata.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/particles/qquickv4particledata.cpp b/src/particles/qquickv4particledata.cpp index acb37f25bf..52acd3d371 100644 --- a/src/particles/qquickv4particledata.cpp +++ b/src/particles/qquickv4particledata.cpp @@ -299,10 +299,10 @@ public: QV4::PersistentValue proto; }; -static QV4::ReturnedValue particleData_discard(const QV4::BuiltinFunction *b, QV4::CallData *callData) +static QV4::ReturnedValue particleData_discard(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *, int) { QV4::Scope scope(b); - QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); + QV4::Scoped<QV4ParticleData> r(scope, *thisObject); if (!r || !r->d()->datum) RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object"))); @@ -311,10 +311,10 @@ static QV4::ReturnedValue particleData_discard(const QV4::BuiltinFunction *b, QV RETURN_RESULT(QV4::Encode::undefined()); } -static QV4::ReturnedValue particleData_lifeLeft(const QV4::BuiltinFunction *b, QV4::CallData *callData) +static QV4::ReturnedValue particleData_lifeLeft(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *, int) { QV4::Scope scope(b); - QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); + QV4::Scoped<QV4ParticleData> r(scope, *thisObject); if (!r || !r->d()->datum) RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object"))); @@ -322,99 +322,99 @@ static QV4::ReturnedValue particleData_lifeLeft(const QV4::BuiltinFunction *b, Q RETURN_RESULT(QV4::Encode(r->d()->datum->lifeLeft(r->d()->particleSystem))); } -static QV4::ReturnedValue particleData_curSize(const QV4::BuiltinFunction *b, QV4::CallData *callData) +static QV4::ReturnedValue particleData_curSize(const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *, int) { QV4::Scope scope(b); - QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); + QV4::Scoped<QV4ParticleData> r(scope, *thisObject); if (!r || !r->d()->datum) RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object"))); RETURN_RESULT(QV4::Encode(r->d()->datum->curSize(r->d()->particleSystem))); } -#define COLOR_GETTER_AND_SETTER(VAR, NAME) static QV4::ReturnedValue particleData_get_ ## NAME (const QV4::BuiltinFunction *b, QV4::CallData *callData) \ +#define COLOR_GETTER_AND_SETTER(VAR, NAME) static QV4::ReturnedValue particleData_get_ ## NAME (const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *, int) \ { \ QV4::Scope scope(b); \ - QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ + QV4::Scoped<QV4ParticleData> r(scope, *thisObject); \ if (!r || !r->d()->datum) \ RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object"))); \ \ RETURN_RESULT(QV4::Encode((r->d()->datum->color. VAR )/255.0));\ }\ \ -static QV4::ReturnedValue particleData_set_ ## NAME (const QV4::BuiltinFunction *b, QV4::CallData *callData)\ +static QV4::ReturnedValue particleData_set_ ## NAME (const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)\ {\ QV4::Scope scope(b); \ - QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ + QV4::Scoped<QV4ParticleData> r(scope, *thisObject); \ if (!r || !r->d()->datum)\ RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object")));\ \ - double d = callData->argc() ? callData->args[0].toNumber() : 0; \ + double d = argc ? argv[0].toNumber() : 0; \ r->d()->datum->color. VAR = qMin(255, qMax(0, (int)::floor(d * 255.0)));\ RETURN_UNDEFINED(); \ } -#define SEMIBOOL_GETTER_AND_SETTER(VARIABLE) static QV4::ReturnedValue particleData_get_ ## VARIABLE (const QV4::BuiltinFunction *b, QV4::CallData *callData) \ +#define SEMIBOOL_GETTER_AND_SETTER(VARIABLE) static QV4::ReturnedValue particleData_get_ ## VARIABLE (const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *, int) \ { \ QV4::Scope scope(b); \ - QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ + QV4::Scoped<QV4ParticleData> r(scope, *thisObject); \ if (!r || !r->d()->datum) \ RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object"))); \ \ RETURN_RESULT(QV4::Encode(r->d()->datum-> VARIABLE));\ }\ \ -static QV4::ReturnedValue particleData_set_ ## VARIABLE (const QV4::BuiltinFunction *b, QV4::CallData *callData)\ +static QV4::ReturnedValue particleData_set_ ## VARIABLE (const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)\ {\ QV4::Scope scope(b); \ - QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ + QV4::Scoped<QV4ParticleData> r(scope, *thisObject); \ if (!r || !r->d()->datum)\ RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object")));\ \ - r->d()->datum-> VARIABLE = (callData->argc() && callData->args[0].toBoolean()) ? 1.0 : 0.0;\ + r->d()->datum-> VARIABLE = (argc && argv[0].toBoolean()) ? 1.0 : 0.0;\ RETURN_UNDEFINED(); \ } -#define FLOAT_GETTER_AND_SETTER(VARIABLE) static QV4::ReturnedValue particleData_get_ ## VARIABLE (const QV4::BuiltinFunction *b, QV4::CallData *callData) \ +#define FLOAT_GETTER_AND_SETTER(VARIABLE) static QV4::ReturnedValue particleData_get_ ## VARIABLE (const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *, int) \ { \ QV4::Scope scope(b); \ - QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ + QV4::Scoped<QV4ParticleData> r(scope, *thisObject); \ if (!r || !r->d()->datum) \ RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object"))); \ \ RETURN_RESULT(QV4::Encode(r->d()->datum-> VARIABLE));\ }\ \ -static QV4::ReturnedValue particleData_set_ ## VARIABLE (const QV4::BuiltinFunction *b, QV4::CallData *callData)\ +static QV4::ReturnedValue particleData_set_ ## VARIABLE (const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)\ {\ QV4::Scope scope(b); \ - QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ + QV4::Scoped<QV4ParticleData> r(scope, *thisObject); \ if (!r || !r->d()->datum)\ RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object")));\ \ - r->d()->datum-> VARIABLE = callData->argc() ? callData->args[0].toNumber() : qt_qnan();\ + r->d()->datum-> VARIABLE = argc ? argv[0].toNumber() : qt_qnan();\ RETURN_UNDEFINED(); \ } -#define FAKE_FLOAT_GETTER_AND_SETTER(VARIABLE, GETTER, SETTER) static QV4::ReturnedValue particleData_get_ ## VARIABLE (const QV4::BuiltinFunction *b, QV4::CallData *callData) \ +#define FAKE_FLOAT_GETTER_AND_SETTER(VARIABLE, GETTER, SETTER) static QV4::ReturnedValue particleData_get_ ## VARIABLE (const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *, int) \ { \ QV4::Scope scope(b); \ - QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ + QV4::Scoped<QV4ParticleData> r(scope, *thisObject); \ if (!r || !r->d()->datum) \ RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object"))); \ \ RETURN_RESULT(QV4::Encode(r->d()->datum-> GETTER (r->d()->particleSystem)));\ }\ \ -static QV4::ReturnedValue particleData_set_ ## VARIABLE (const QV4::BuiltinFunction *b, QV4::CallData *callData)\ +static QV4::ReturnedValue particleData_set_ ## VARIABLE (const QV4::FunctionObject *b, const QV4::Value *thisObject, const QV4::Value *argv, int argc)\ {\ QV4::Scope scope(b); \ - QV4::Scoped<QV4ParticleData> r(scope, callData->thisObject); \ + QV4::Scoped<QV4ParticleData> r(scope, *thisObject); \ if (!r || !r->d()->datum)\ RETURN_RESULT(scope.engine->throwError(QStringLiteral("Not a valid ParticleData object")));\ \ - r->d()->datum-> SETTER (callData->argc() ? callData->args[0].toNumber() : qt_qnan(), r->d()->particleSystem);\ + r->d()->datum-> SETTER (argc ? argv[0].toNumber() : qt_qnan(), r->d()->particleSystem);\ RETURN_UNDEFINED(); \ } |