Fix API of QQmlV4Handle

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

4 files changed, 10 insertions, 10 deletions

diff --git a/src/particles/qquickcustomaffector.cpp b/src/particles/qquickcustomaffector.cpp
index 583e3b6555..7c4d45d24e 100644
--- a/src/particles/qquickcustomaffector.cpp
+++ b/src/particles/qquickcustomaffector.cpp
@@ -150,11 +150,11 @@ void QQuickCustomAffector::affectSystem(qreal dt)
     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, (v = toAffect[i]->v4Value().toValue()));
+        array->putIndexed(i, (v = toAffect[i]->v4Value()));
 
     if (dt >= simulationCutoff || dt <= simulationDelta) {
         affectProperties(toAffect, dt);
-        emit affectParticles(QQmlV4Handle(array.asValue()), dt);
+        emit affectParticles(QQmlV4Handle(array), dt);
     } else {
         int realTime = m_system->timeInt;
         m_system->timeInt -= dt * 1000.0;
@@ -162,12 +162,12 @@ void QQuickCustomAffector::affectSystem(qreal dt)
             m_system->timeInt += simulationDelta * 1000.0;
             dt -= simulationDelta;
             affectProperties(toAffect, simulationDelta);
-            emit affectParticles(QQmlV4Handle(array.asValue()), simulationDelta);
+            emit affectParticles(QQmlV4Handle(array), simulationDelta);
         }
         m_system->timeInt = realTime;
         if (dt > 0.0) {
             affectProperties(toAffect, dt);
-            emit affectParticles(QQmlV4Handle(array.asValue()), dt);
+            emit affectParticles(QQmlV4Handle(array), dt);
         }
     }
 
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp
index d42c92304b..0f251ea751 100644
--- a/src/particles/qquickparticleemitter.cpp
+++ b/src/particles/qquickparticleemitter.cpp
@@ -488,9 +488,9 @@ void QQuickParticleEmitter::emitWindow(int timeStamp)
         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, (v = toEmit[i]->v4Value().toValue()));
+            array->putIndexed(i, (v = toEmit[i]->v4Value()));
 
-        emitParticles(QQmlV4Handle(array.asValue()));//A chance for arbitrary JS changes
+        emitParticles(QQmlV4Handle(array));//A chance for arbitrary JS changes
     }
 
     m_last_emission = pt;
diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp
index b78745f030..7b5788f467 100644
--- a/src/particles/qquicktrailemitter.cpp
+++ b/src/particles/qquicktrailemitter.cpp
@@ -276,12 +276,12 @@ void QQuickTrailEmitter::emitWindow(int timeStamp)
             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, (v = toEmit[i]->v4Value().toValue()));
+                array->putIndexed(i, (v = toEmit[i]->v4Value()));
 
             if (isEmitFollowConnected())
-                emitFollowParticles(QQmlV4Handle(array.asValue()), d->v4Value());//A chance for many arbitrary JS changes
+                emitFollowParticles(QQmlV4Handle(array), d->v4Value());//A chance for many arbitrary JS changes
             else if (isEmitConnected())
-                emitParticles(QQmlV4Handle(array.asValue()));//A chance for arbitrary JS changes
+                emitParticles(QQmlV4Handle(array));//A chance for arbitrary JS changes
         }
         m_lastEmission[d->index] = pt;
     }
diff --git a/src/particles/qquickv4particledata.cpp b/src/particles/qquickv4particledata.cpp
index 8cbe42bdd3..71ca4d31d0 100644
--- a/src/particles/qquickv4particledata.cpp
+++ b/src/particles/qquickv4particledata.cpp
@@ -525,7 +525,7 @@ QQuickV4ParticleData::~QQuickV4ParticleData()
 
 QQmlV4Handle QQuickV4ParticleData::v4Value()
 {
-    return QQmlV4Handle(QV4::Value::fromReturnedValue(m_v4Value.value()));
+    return QQmlV4Handle(m_v4Value.value());
 }
 
 QT_END_NAMESPACE