Cleanups

Simplify some code in BooleanObject
Simplify access to call arguments and thisObject

Change-Id: I2f8e844019bc587385608beb02f05b15f827535c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 15 insertions, 15 deletions

diff --git a/src/particles/qquickv4particledata.cpp b/src/particles/qquickv4particledata.cpp
index a83c2052fc..c8b262e002 100644
--- a/src/particles/qquickv4particledata.cpp
+++ b/src/particles/qquickv4particledata.cpp
@@ -290,7 +290,7 @@ public:
 static QV4::ReturnedValue particleData_discard(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
-    QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject);
+    QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject());
 
     if (!r || !r->d()->datum)
         return ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object"));
@@ -302,7 +302,7 @@ static QV4::ReturnedValue particleData_discard(QV4::CallContext *ctx)
 static QV4::ReturnedValue particleData_lifeLeft(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
-    QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject);
+    QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject());
 
     if (!r || !r->d()->datum)
         return ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object"));
@@ -313,7 +313,7 @@ static QV4::ReturnedValue particleData_lifeLeft(QV4::CallContext *ctx)
 static QV4::ReturnedValue particleData_curSize(QV4::CallContext *ctx)
 {
     QV4::Scope scope(ctx);
-    QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject);
+    QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject());
 
     if (!r || !r->d()->datum)
         return ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object"));
@@ -323,7 +323,7 @@ static QV4::ReturnedValue particleData_curSize(QV4::CallContext *ctx)
 #define COLOR_GETTER_AND_SETTER(VAR, NAME) static QV4::ReturnedValue particleData_get_ ## NAME (QV4::CallContext *ctx) \
 { \
     QV4::Scope scope(ctx); \
-    QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \
+    QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \
     if (!r || !r->d()->datum) \
         ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); \
 \
@@ -333,11 +333,11 @@ static QV4::ReturnedValue particleData_curSize(QV4::CallContext *ctx)
 static QV4::ReturnedValue particleData_set_ ## NAME (QV4::CallContext *ctx)\
 {\
     QV4::Scope scope(ctx); \
-    QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \
+    QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \
     if (!r || !r->d()->datum)\
         ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object"));\
 \
-    double d = ctx->d()->callData->argc ? ctx->d()->callData->args[0].toNumber() : 0; \
+    double d = ctx->argc() ? ctx->args()[0].toNumber() : 0; \
     r->d()->datum->color. VAR = qMin(255, qMax(0, (int)floor(d * 255.0)));\
     return QV4::Encode::undefined(); \
 }
@@ -346,7 +346,7 @@ static QV4::ReturnedValue particleData_set_ ## NAME (QV4::CallContext *ctx)\
 #define SEMIBOOL_GETTER_AND_SETTER(VARIABLE) static QV4::ReturnedValue particleData_get_ ## VARIABLE (QV4::CallContext *ctx) \
 { \
     QV4::Scope scope(ctx); \
-    QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \
+    QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \
     if (!r || !r->d()->datum) \
         ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); \
 \
@@ -356,18 +356,18 @@ static QV4::ReturnedValue particleData_set_ ## NAME (QV4::CallContext *ctx)\
 static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\
 {\
     QV4::Scope scope(ctx); \
-    QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \
+    QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \
     if (!r || !r->d()->datum)\
         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;\
+    r->d()->datum-> VARIABLE = (ctx->argc() && ctx->args()[0].toBoolean()) ? 1.0 : 0.0;\
     return QV4::Encode::undefined(); \
 }
 
 #define FLOAT_GETTER_AND_SETTER(VARIABLE) static QV4::ReturnedValue particleData_get_ ## VARIABLE (QV4::CallContext *ctx) \
 { \
     QV4::Scope scope(ctx); \
-    QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \
+    QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \
     if (!r || !r->d()->datum) \
         ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); \
 \
@@ -377,18 +377,18 @@ static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\
 static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\
 {\
     QV4::Scope scope(ctx); \
-    QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \
+    QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \
     if (!r || !r->d()->datum)\
         ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object"));\
 \
-    r->d()->datum-> VARIABLE = ctx->d()->callData->argc ? ctx->d()->callData->args[0].toNumber() : qSNaN();\
+    r->d()->datum-> VARIABLE = ctx->argc() ? ctx->args()[0].toNumber() : qSNaN();\
     return QV4::Encode::undefined(); \
 }
 
 #define FAKE_FLOAT_GETTER_AND_SETTER(VARIABLE, GETTER, SETTER) static QV4::ReturnedValue particleData_get_ ## VARIABLE (QV4::CallContext *ctx) \
 { \
     QV4::Scope scope(ctx); \
-    QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \
+    QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \
     if (!r || !r->d()->datum) \
         ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object")); \
 \
@@ -398,11 +398,11 @@ static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\
 static QV4::ReturnedValue particleData_set_ ## VARIABLE (QV4::CallContext *ctx)\
 {\
     QV4::Scope scope(ctx); \
-    QV4::Scoped<QV4ParticleData> r(scope, ctx->d()->callData->thisObject); \
+    QV4::Scoped<QV4ParticleData> r(scope, ctx->thisObject()); \
     if (!r || !r->d()->datum)\
         ctx->engine()->throwError(QStringLiteral("Not a valid ParticleData object"));\
 \
-    r->d()->datum-> SETTER (ctx->d()->callData->argc ? ctx->d()->callData->args[0].toNumber() : qSNaN());\
+    r->d()->datum-> SETTER (ctx->argc() ? ctx->args()[0].toNumber() : qSNaN());\
     return QV4::Encode::undefined(); \
 }