diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-09-12 11:13:03 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:13:47 +0200 |
commit | 16f92ad85cf665d863ded5eeaaa7fc3f90820b3f (patch) | |
tree | 74b3477b9d6c023730835f1c478ceb6eaec68a2b /src/particles/qquickv4particledata.cpp | |
parent | 7d4e61dd824706984030c58684fa844ff9cde251 (diff) |
Convert builtin methods to return a ReturnedValue
Change-Id: I6b75adbf53a5be0deab023d2eed98ce2a7915551
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/particles/qquickv4particledata.cpp')
-rw-r--r-- | src/particles/qquickv4particledata.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/particles/qquickv4particledata.cpp b/src/particles/qquickv4particledata.cpp index 2cb95b4a91..1a574600e0 100644 --- a/src/particles/qquickv4particledata.cpp +++ b/src/particles/qquickv4particledata.cpp @@ -298,7 +298,7 @@ public: QV4::PersistentValue proto; }; -static QV4::Value particleData_discard(QV4::SimpleCallContext *ctx) +static QV4::ReturnedValue particleData_discard(QV4::SimpleCallContext *ctx) { QV4ParticleData *r = ctx->thisObject.as<QV4ParticleData>(); @@ -306,101 +306,101 @@ static QV4::Value particleData_discard(QV4::SimpleCallContext *ctx) ctx->throwError(QStringLiteral("Not a valid ParticleData object")); r->datum->lifeSpan = 0; //Don't kill(), because it could still be in the middle of being created - return QV4::Value::undefinedValue(); + return QV4::Encode::undefined(); } -static QV4::Value particleData_lifeLeft(QV4::SimpleCallContext *ctx) +static QV4::ReturnedValue particleData_lifeLeft(QV4::SimpleCallContext *ctx) { QV4ParticleData *r = ctx->thisObject.as<QV4ParticleData>(); if (!r || !r->datum) ctx->throwError(QStringLiteral("Not a valid ParticleData object")); - return QV4::Value::fromDouble(r->datum->lifeLeft()); + return QV4::Encode(r->datum->lifeLeft()); } -static QV4::Value particleData_curSize(QV4::SimpleCallContext *ctx) +static QV4::ReturnedValue particleData_curSize(QV4::SimpleCallContext *ctx) { QV4ParticleData *r = ctx->thisObject.as<QV4ParticleData>(); if (!r || !r->datum) ctx->throwError(QStringLiteral("Not a valid ParticleData object")); - return QV4::Value::fromDouble(r->datum->curSize()); + return QV4::Encode(r->datum->curSize()); } -#define COLOR_GETTER_AND_SETTER(VAR, NAME) static QV4::Value particleData_get_ ## NAME (QV4::SimpleCallContext *ctx) \ +#define COLOR_GETTER_AND_SETTER(VAR, NAME) static QV4::ReturnedValue particleData_get_ ## NAME (QV4::SimpleCallContext *ctx) \ { \ QV4ParticleData *r = ctx->thisObject.as<QV4ParticleData>(); \ if (!r || !r->datum) \ ctx->throwError(QStringLiteral("Not a valid ParticleData object")); \ \ - return QV4::Value::fromDouble((r->datum->color. VAR )/255.0);\ + return QV4::Encode((r->datum->color. VAR )/255.0);\ }\ \ -static QV4::Value particleData_set_ ## NAME (QV4::SimpleCallContext *ctx)\ +static QV4::ReturnedValue particleData_set_ ## NAME (QV4::SimpleCallContext *ctx)\ {\ QV4ParticleData *r = ctx->thisObject.as<QV4ParticleData>(); \ if (!r || !r->datum)\ ctx->throwError(QStringLiteral("Not a valid ParticleData object"));\ \ r->datum->color. VAR = qMin(255, qMax(0, (int)floor(ctx->argument(0).toNumber() * 255.0)));\ - return QV4::Value::undefinedValue(); \ + return QV4::Encode::undefined(); \ } -#define SEMIBOOL_GETTER_AND_SETTER(VARIABLE) static QV4::Value particleData_get_ ## VARIABLE (QV4::SimpleCallContext *ctx) \ +#define SEMIBOOL_GETTER_AND_SETTER(VARIABLE) static QV4::ReturnedValue particleData_get_ ## VARIABLE (QV4::SimpleCallContext *ctx) \ { \ QV4ParticleData *r = ctx->thisObject.as<QV4ParticleData>(); \ if (!r || !r->datum) \ ctx->throwError(QStringLiteral("Not a valid ParticleData object")); \ \ - return QV4::Value::fromBoolean(r->datum-> VARIABLE);\ + return QV4::Encode(r->datum-> VARIABLE);\ }\ \ -static QV4::Value particleData_set_ ## VARIABLE (QV4::SimpleCallContext *ctx)\ +static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::SimpleCallContext *ctx)\ {\ QV4ParticleData *r = ctx->thisObject.as<QV4ParticleData>(); \ if (!r || !r->datum)\ ctx->throwError(QStringLiteral("Not a valid ParticleData object"));\ \ r->datum-> VARIABLE = ctx->argument(0).toBoolean() ? 1.0 : 0.0;\ - return QV4::Value::undefinedValue(); \ + return QV4::Encode::undefined(); \ } -#define FLOAT_GETTER_AND_SETTER(VARIABLE) static QV4::Value particleData_get_ ## VARIABLE (QV4::SimpleCallContext *ctx) \ +#define FLOAT_GETTER_AND_SETTER(VARIABLE) static QV4::ReturnedValue particleData_get_ ## VARIABLE (QV4::SimpleCallContext *ctx) \ { \ QV4ParticleData *r = ctx->thisObject.as<QV4ParticleData>(); \ if (!r || !r->datum) \ ctx->throwError(QStringLiteral("Not a valid ParticleData object")); \ \ - return QV4::Value::fromDouble(r->datum-> VARIABLE);\ + return QV4::Encode(r->datum-> VARIABLE);\ }\ \ -static QV4::Value particleData_set_ ## VARIABLE (QV4::SimpleCallContext *ctx)\ +static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::SimpleCallContext *ctx)\ {\ QV4ParticleData *r = ctx->thisObject.as<QV4ParticleData>(); \ if (!r || !r->datum)\ ctx->throwError(QStringLiteral("Not a valid ParticleData object"));\ \ r->datum-> VARIABLE = ctx->argument(0).toNumber();\ - return QV4::Value::undefinedValue(); \ + return QV4::Encode::undefined(); \ } -#define FAKE_FLOAT_GETTER_AND_SETTER(VARIABLE, GETTER, SETTER) static QV4::Value particleData_get_ ## VARIABLE (QV4::SimpleCallContext *ctx) \ +#define FAKE_FLOAT_GETTER_AND_SETTER(VARIABLE, GETTER, SETTER) static QV4::ReturnedValue particleData_get_ ## VARIABLE (QV4::SimpleCallContext *ctx) \ { \ QV4ParticleData *r = ctx->thisObject.as<QV4ParticleData>(); \ if (!r || !r->datum) \ ctx->throwError(QStringLiteral("Not a valid ParticleData object")); \ \ - return QV4::Value::fromDouble(r->datum-> GETTER ());\ + return QV4::Encode(r->datum-> GETTER ());\ }\ \ -static QV4::Value particleData_set_ ## VARIABLE (QV4::SimpleCallContext *ctx)\ +static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::SimpleCallContext *ctx)\ {\ QV4ParticleData *r = ctx->thisObject.as<QV4ParticleData>(); \ if (!r || !r->datum)\ ctx->throwError(QStringLiteral("Not a valid ParticleData object"));\ \ r->datum-> SETTER ( ctx->argument(0).toNumber() );\ - return QV4::Value::undefinedValue(); \ + return QV4::Encode::undefined(); \ } #define REGISTER_ACCESSOR(PROTO, ENGINE, VARIABLE, NAME) \ |