diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-09-19 09:10:42 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 01:06:20 +0200 |
commit | 332b870bd8f0fba6f09e539376a674d7a4413631 (patch) | |
tree | a3977c20b6331e1e6ab1d85e5e25836155797d0c /src/particles | |
parent | df5edd28bc4258b89d9d5ffdddf837f339a17aad (diff) |
Convert putIndexed()
Change-Id: I7d02b0fdf45079d0f7afcfb6d3158dd60cb09f33
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/particles')
-rw-r--r-- | src/particles/qquickcustomaffector.cpp | 3 | ||||
-rw-r--r-- | src/particles/qquickparticleemitter.cpp | 3 | ||||
-rw-r--r-- | src/particles/qquicktrailemitter.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/particles/qquickcustomaffector.cpp b/src/particles/qquickcustomaffector.cpp index 09f8967045..583e3b6555 100644 --- a/src/particles/qquickcustomaffector.cpp +++ b/src/particles/qquickcustomaffector.cpp @@ -148,8 +148,9 @@ void QQuickCustomAffector::affectSystem(qreal dt) QV4::Scope scope(v4); QV4::Scoped<QV4::ArrayObject> array(scope, v4->newArrayObject(toAffect.size())); + QV4::ScopedValue v(scope); for (int i=0; i<toAffect.size(); i++) - array->putIndexed(i, toAffect[i]->v4Value().toValue()); + array->putIndexed(i, (v = toAffect[i]->v4Value().toValue())); if (dt >= simulationCutoff || dt <= simulationDelta) { affectProperties(toAffect, dt); diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp index 404554c9b6..d42c92304b 100644 --- a/src/particles/qquickparticleemitter.cpp +++ b/src/particles/qquickparticleemitter.cpp @@ -486,8 +486,9 @@ void QQuickParticleEmitter::emitWindow(int timeStamp) //Done after emitParticle so that the Painter::load is done first, this allows you to customize its static variables //We then don't need to request another reload, because the first reload isn't scheduled until we get back to the render thread QV4::Scoped<QV4::ArrayObject> array(scope, v4->newArrayObject(toEmit.size())); + QV4::ScopedValue v(scope); for (int i=0; i<toEmit.size(); i++) - array->putIndexed(i, toEmit[i]->v4Value().toValue()); + array->putIndexed(i, (v = toEmit[i]->v4Value().toValue())); emitParticles(QQmlV4Handle(array.asValue()));//A chance for arbitrary JS changes } diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp index 84caebf5be..b78745f030 100644 --- a/src/particles/qquicktrailemitter.cpp +++ b/src/particles/qquicktrailemitter.cpp @@ -274,8 +274,9 @@ void QQuickTrailEmitter::emitWindow(int timeStamp) QV4::Scope scope(v4); QV4::Scoped<QV4::ArrayObject> array(scope, v4->newArrayObject(toEmit.size())); + QV4::ScopedValue v(scope); for (int i=0; i<toEmit.size(); i++) - array->putIndexed(i, toEmit[i]->v4Value().toValue()); + array->putIndexed(i, (v = toEmit[i]->v4Value().toValue())); if (isEmitFollowConnected()) emitFollowParticles(QQmlV4Handle(array.asValue()), d->v4Value());//A chance for many arbitrary JS changes |