diff options
| author | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-09-14 14:54:42 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-09-19 09:44:33 +0000 |
| commit | 042aa2eb0e55616fc754d0d71246efb531ca6dfe (patch) | |
| tree | f48118a1f8564b4c4cbadc0ebf291d56d59dbb70 /src/particles | |
| parent | b7ddcdad876cf0a46aa14a0f78ee8b3e4f685c19 (diff) | |
Change CallData::argc to be a QV4::Value
Instead of mimicking a Value. This makes sure that argc now stays
correct even when anything on Value changes.
Most of the change is mechanical: replace callData->argc by
callData->argc().
Change-Id: I521831ae1ffb3966bad6589c18d7a373e13439d7
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/particles')
| -rw-r--r-- | src/particles/qquickv4particledata.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/particles/qquickv4particledata.cpp b/src/particles/qquickv4particledata.cpp index 4e218c91ea..ee1c334536 100644 --- a/src/particles/qquickv4particledata.cpp +++ b/src/particles/qquickv4particledata.cpp @@ -346,7 +346,7 @@ static QV4::ReturnedValue particleData_set_ ## NAME (const QV4::BuiltinFunction 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 = callData->argc() ? callData->args[0].toNumber() : 0; \ r->d()->datum->color. VAR = qMin(255, qMax(0, (int)::floor(d * 255.0)));\ RETURN_UNDEFINED(); \ } @@ -369,7 +369,7 @@ static QV4::ReturnedValue particleData_set_ ## VARIABLE (const QV4::BuiltinFunct 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 = (callData->argc() && callData->args[0].toBoolean()) ? 1.0 : 0.0;\ RETURN_UNDEFINED(); \ } @@ -390,7 +390,7 @@ static QV4::ReturnedValue particleData_set_ ## VARIABLE (const QV4::BuiltinFunct 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 = callData->argc() ? callData->args[0].toNumber() : qt_qnan();\ RETURN_UNDEFINED(); \ } @@ -411,7 +411,7 @@ static QV4::ReturnedValue particleData_set_ ## VARIABLE (const QV4::BuiltinFunct 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 (callData->argc() ? callData->args[0].toNumber() : qt_qnan(), r->d()->particleSystem);\ RETURN_UNDEFINED(); \ } |