diff options
| author | Oleg Shparber <trollixx@gmail.com> | 2014-12-31 10:40:16 -0800 |
|---|---|---|
| committer | Oleg Shparber <trollixx@gmail.com> | 2015-01-03 23:29:51 +0100 |
| commit | 4a9ed3de7d92809cf575f245f55d4f422b4983c3 (patch) | |
| tree | df242fa9aa2895cf451096d2384e8f04ce1d0c70 /src/particles | |
| parent | 21d481c209692ec73ab6b6bc43e6977fc2f8c2fc (diff) | |
Use QV4::ScopedArrayObject typedef instead of actual type
Change-Id: I975536745ac6c264aca074f84d223fbec7682d3d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
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 874371632e..3fecc83a4e 100644 --- a/src/particles/qquickcustomaffector.cpp +++ b/src/particles/qquickcustomaffector.cpp @@ -141,7 +141,7 @@ void QQuickCustomAffector::affectSystem(qreal dt) QV4::ExecutionEngine *v4 = QV8Engine::getV4(qmlEngine->handle()); QV4::Scope scope(v4); - QV4::Scoped<QV4::ArrayObject> array(scope, v4->newArrayObject(toAffect.size())); + 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())); diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp index 9c7d9facf3..b76e917069 100644 --- a/src/particles/qquickparticleemitter.cpp +++ b/src/particles/qquickparticleemitter.cpp @@ -479,7 +479,7 @@ 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::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())); diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp index d948f21820..f27a566653 100644 --- a/src/particles/qquicktrailemitter.cpp +++ b/src/particles/qquicktrailemitter.cpp @@ -264,7 +264,7 @@ void QQuickTrailEmitter::emitWindow(int timeStamp) QV4::ExecutionEngine *v4 = QV8Engine::getV4(qmlEngine->handle()); QV4::Scope scope(v4); - QV4::Scoped<QV4::ArrayObject> array(scope, v4->newArrayObject(toEmit.size())); + 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())); |