diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-07-28 10:07:57 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-04 20:17:54 +0100 |
| commit | 486948817b26da2c62802bb93a0f671715c609d4 (patch) | |
| tree | 45cd51615a6d187ac504c18c4dee4aa31cf9a771 /src/particles/qquickv4particledata.cpp | |
| parent | 6f6b350976ccfe959223b1fbe8c21fe71efc45bd (diff) | |
Move the throw methods from ExecutionContext to ExecutionEngine
The methods don't require a context, and thus shouldn't be
implemented there.
Change-Id: If058e0c5067093a4161f2275ac4288aa2bc500f3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/particles/qquickv4particledata.cpp')
| -rw-r--r-- | src/particles/qquickv4particledata.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/particles/qquickv4particledata.cpp b/src/particles/qquickv4particledata.cpp index 586066ec24..90eeca7b8e 100644 --- a/src/particles/qquickv4particledata.cpp +++ b/src/particles/qquickv4particledata.cpp @@ -294,7 +294,7 @@ static QV4::ReturnedValue particleData_discard(QV4::CallContext *ctx) QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); if (!r || !r->d()->datum) - return ctx->throwError(QStringLiteral("Not a valid ParticleData object")); + return ctx->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(); @@ -306,7 +306,7 @@ static QV4::ReturnedValue particleData_lifeLeft(QV4::CallContext *ctx) QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); if (!r || !r->d()->datum) - return ctx->throwError(QStringLiteral("Not a valid ParticleData object")); + return ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); return QV4::Encode(r->d()->datum->lifeLeft()); } @@ -317,7 +317,7 @@ static QV4::ReturnedValue particleData_curSize(QV4::CallContext *ctx) QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); if (!r || !r->d()->datum) - return ctx->throwError(QStringLiteral("Not a valid ParticleData object")); + return ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); return QV4::Encode(r->d()->datum->curSize()); } @@ -326,7 +326,7 @@ static QV4::ReturnedValue particleData_curSize(QV4::CallContext *ctx) QV4::Scope scope(ctx); \ QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \ if (!r || !r->d()->datum) \ - ctx->throwError(QStringLiteral("Not a valid ParticleData object")); \ + ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); \ \ return QV4::Encode((r->d()->datum->color. VAR )/255.0);\ }\ @@ -336,7 +336,7 @@ static QV4::ReturnedValue particleData_set_ ## NAME (QV4::CallContext *ctx)\ QV4::Scope scope(ctx); \ QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \ if (!r || !r->d()->datum)\ - ctx->throwError(QStringLiteral("Not a valid ParticleData object"));\ + ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object"));\ \ double d = ctx->d()->callData->argc ? ctx->d()->callData->args[0].toNumber() : 0; \ r->d()->datum->color. VAR = qMin(255, qMax(0, (int)floor(d * 255.0)));\ @@ -349,7 +349,7 @@ static QV4::ReturnedValue particleData_set_ ## NAME (QV4::CallContext *ctx)\ QV4::Scope scope(ctx); \ QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \ if (!r || !r->d()->datum) \ - ctx->throwError(QStringLiteral("Not a valid ParticleData object")); \ + ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); \ \ return QV4::Encode(r->d()->datum-> VARIABLE);\ }\ @@ -359,7 +359,7 @@ static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\ QV4::Scope scope(ctx); \ QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \ if (!r || !r->d()->datum)\ - ctx->throwError(QStringLiteral("Not a valid ParticleData object"));\ + ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object"));\ \ r->d()->datum-> VARIABLE = (ctx->d()->callData->argc && ctx->d()->callData->args[0].toBoolean()) ? 1.0 : 0.0;\ return QV4::Encode::undefined(); \ @@ -370,7 +370,7 @@ static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\ QV4::Scope scope(ctx); \ QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \ if (!r || !r->d()->datum) \ - ctx->throwError(QStringLiteral("Not a valid ParticleData object")); \ + ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); \ \ return QV4::Encode(r->d()->datum-> VARIABLE);\ }\ @@ -380,7 +380,7 @@ static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\ QV4::Scope scope(ctx); \ QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \ if (!r || !r->d()->datum)\ - ctx->throwError(QStringLiteral("Not a valid ParticleData object"));\ + ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object"));\ \ r->d()->datum-> VARIABLE = ctx->d()->callData->argc ? ctx->d()->callData->args[0].toNumber() : qSNaN();\ return QV4::Encode::undefined(); \ @@ -391,7 +391,7 @@ static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\ QV4::Scope scope(ctx); \ QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \ if (!r || !r->d()->datum) \ - ctx->throwError(QStringLiteral("Not a valid ParticleData object")); \ + ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); \ \ return QV4::Encode(r->d()->datum-> GETTER ());\ }\ @@ -401,7 +401,7 @@ static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\ QV4::Scope scope(ctx); \ QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \ if (!r || !r->d()->datum)\ - ctx->throwError(QStringLiteral("Not a valid ParticleData object"));\ + ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object"));\ \ r->d()->datum-> SETTER (ctx->d()->callData->argc ? ctx->d()->callData->args[0].toNumber() : qSNaN());\ return QV4::Encode::undefined(); \ |