diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-06-22 15:34:57 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-07-02 19:29:25 +0000 |
| commit | 98263a01373f5b225d64da216537165ae27d7ff1 (patch) | |
| tree | 60980c16c6cc6f6658355bcd428245819b4b732a /src/particles | |
| parent | d21ef386ece52490d428daacb8f7f4658e9f78e5 (diff) | |
Unify put and putIndexed
Pass an Identifier through those virtual methods to unify
the string and integer based versions.
Also add the receiver that's required in ES7
Change-Id: I4e7f01b4c97cc80bcb3c485f6343f28213dc9e6b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/particles')
| -rw-r--r-- | src/particles/qquickcustomaffector.cpp | 2 | ||||
| -rw-r--r-- | src/particles/qquickparticleemitter.cpp | 2 | ||||
| -rw-r--r-- | src/particles/qquicktrailemitter.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/particles/qquickcustomaffector.cpp b/src/particles/qquickcustomaffector.cpp index 53557e1d0b..ccb00eeba2 100644 --- a/src/particles/qquickcustomaffector.cpp +++ b/src/particles/qquickcustomaffector.cpp @@ -154,7 +154,7 @@ void QQuickCustomAffector::affectSystem(qreal dt) QV4::ScopedArrayObject array(scope, v4->newArrayObject(toAffect.size())); QV4::ScopedValue v(scope); for (int i=0; i<toAffect.size(); i++) - array->putIndexed(i, (v = toAffect[i]->v4Value(m_system))); + array->put(i, (v = toAffect[i]->v4Value(m_system))); if (dt >= simulationCutoff || dt <= simulationDelta) { affectProperties(toAffect, dt); diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp index cd4cdcf3ef..5ec834a463 100644 --- a/src/particles/qquickparticleemitter.cpp +++ b/src/particles/qquickparticleemitter.cpp @@ -494,7 +494,7 @@ void QQuickParticleEmitter::emitWindow(int timeStamp) QV4::ScopedArrayObject array(scope, v4->newArrayObject(toEmit.size())); QV4::ScopedValue v(scope); for (int i=0; i<toEmit.size(); i++) - array->putIndexed(i, (v = toEmit[i]->v4Value(m_system))); + array->put(i, (v = toEmit[i]->v4Value(m_system))); emitParticles(QQmlV4Handle(array));//A chance for arbitrary JS changes } diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp index f0a0b297e2..ca3ebbd4ec 100644 --- a/src/particles/qquicktrailemitter.cpp +++ b/src/particles/qquicktrailemitter.cpp @@ -273,7 +273,7 @@ void QQuickTrailEmitter::emitWindow(int timeStamp) QV4::ScopedArrayObject array(scope, v4->newArrayObject(toEmit.size())); QV4::ScopedValue v(scope); for (int i=0; i<toEmit.size(); i++) - array->putIndexed(i, (v = toEmit[i]->v4Value(m_system))); + array->put(i, (v = toEmit[i]->v4Value(m_system))); if (isEmitFollowConnected()) emitFollowParticles(QQmlV4Handle(array), d->v4Value(m_system));//A chance for many arbitrary JS changes |