Remove v8 dependencies from QQmlV4Handle

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

6 files changed, 12 insertions, 12 deletions

diff --git a/src/particles/qquickcustomaffector.cpp b/src/particles/qquickcustomaffector.cpp
index 9c46510091..37db984e92 100644
--- a/src/particles/qquickcustomaffector.cpp
+++ b/src/particles/qquickcustomaffector.cpp
@@ -145,11 +145,11 @@ void QQuickCustomAffector::affectSystem(qreal dt)
 
     v8::Handle<v8::Array> array = v8::Array::New(toAffect.size());
     for (int i=0; i<toAffect.size(); i++)
-        array->Set(i, toAffect[i]->v8Value().toV8Handle());
+        array->Set(i, toAffect[i]->v4Value().toValue());
 
     if (dt >= simulationCutoff || dt <= simulationDelta) {
         affectProperties(toAffect, dt);
-        emit affectParticles(QQmlV4Handle::fromV8Handle(array), dt);
+        emit affectParticles(QQmlV4Handle(array->v4Value()), dt);
     } else {
         int realTime = m_system->timeInt;
         m_system->timeInt -= dt * 1000.0;
@@ -157,12 +157,12 @@ void QQuickCustomAffector::affectSystem(qreal dt)
             m_system->timeInt += simulationDelta * 1000.0;
             dt -= simulationDelta;
             affectProperties(toAffect, simulationDelta);
-            emit affectParticles(QQmlV4Handle::fromV8Handle(array), simulationDelta);
+            emit affectParticles(QQmlV4Handle(array->v4Value()), simulationDelta);
         }
         m_system->timeInt = realTime;
         if (dt > 0.0) {
             affectProperties(toAffect, dt);
-            emit affectParticles(QQmlV4Handle::fromV8Handle(array), dt);
+            emit affectParticles(QQmlV4Handle(array->v4Value()), dt);
         }
     }
 
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp
index d3a7adb1a8..630565f8f2 100644
--- a/src/particles/qquickparticleemitter.cpp
+++ b/src/particles/qquickparticleemitter.cpp
@@ -481,9 +481,9 @@ void QQuickParticleEmitter::emitWindow(int timeStamp)
         //We then don't need to request another reload, because the first reload isn't scheduled until we get back to the render thread
         v8::Handle<v8::Array> array = v8::Array::New(toEmit.size());
         for (int i=0; i<toEmit.size(); i++)
-            array->Set(i, toEmit[i]->v8Value().toV8Handle());
+            array->Set(i, toEmit[i]->v4Value().toValue());
 
-        emitParticles(QQmlV4Handle::fromV8Handle(array));//A chance for arbitrary JS changes
+        emitParticles(QQmlV4Handle(array->v4Value()));//A chance for arbitrary JS changes
     }
 
     m_last_emission = pt;
diff --git a/src/particles/qquickparticlesystem.cpp b/src/particles/qquickparticlesystem.cpp
index ce67fecf54..47761994e0 100644
--- a/src/particles/qquickparticlesystem.cpp
+++ b/src/particles/qquickparticlesystem.cpp
@@ -527,7 +527,7 @@ void QQuickParticleData::clone(const QQuickParticleData& other)
     animationOwner = other.animationOwner;
 }
 
-QQmlV4Handle QQuickParticleData::v8Value()
+QQmlV4Handle QQuickParticleData::v4Value()
 {
     if (!v8Datum)
         v8Datum = new QQuickV8ParticleData(QQmlEnginePrivate::getV8Engine(qmlEngine(system)), this);
diff --git a/src/particles/qquickparticlesystem_p.h b/src/particles/qquickparticlesystem_p.h
index 3b58fd139e..1eb26a27fb 100644
--- a/src/particles/qquickparticlesystem_p.h
+++ b/src/particles/qquickparticlesystem_p.h
@@ -228,7 +228,7 @@ public:
     float lifeLeft();
     float curSize();
     void clone(const QQuickParticleData& other);//Not =, leaves meta-data like index
-    QQmlV4Handle v8Value();
+    QQmlV4Handle v4Value();
     void extendLife(float time);
 private:
     QQuickV8ParticleData* v8Datum;
diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp
index c0e65e52e4..85cc23cd8b 100644
--- a/src/particles/qquicktrailemitter.cpp
+++ b/src/particles/qquicktrailemitter.cpp
@@ -271,12 +271,12 @@ void QQuickTrailEmitter::emitWindow(int timeStamp)
         if (isEmitConnected() || isEmitFollowConnected()) {
             v8::Handle<v8::Array> array = v8::Array::New(toEmit.size());
             for (int i=0; i<toEmit.size(); i++)
-                array->Set(i, toEmit[i]->v8Value().toV8Handle());
+                array->Set(i, toEmit[i]->v4Value().toValue());
 
             if (isEmitFollowConnected())
-                emitFollowParticles(QQmlV4Handle::fromV8Handle(array), d->v8Value());//A chance for many arbitrary JS changes
+                emitFollowParticles(QQmlV4Handle(array->v4Value()), d->v4Value());//A chance for many arbitrary JS changes
             else if (isEmitConnected())
-                emitParticles(QQmlV4Handle::fromV8Handle(array));//A chance for arbitrary JS changes
+                emitParticles(QQmlV4Handle(array->v4Value()));//A chance for arbitrary JS changes
         }
         m_lastEmission[d->index] = pt;
     }
diff --git a/src/particles/qquickv8particledata.cpp b/src/particles/qquickv8particledata.cpp
index 9b8d1adfb9..8a73e4b287 100644
--- a/src/particles/qquickv8particledata.cpp
+++ b/src/particles/qquickv8particledata.cpp
@@ -496,7 +496,7 @@ QQuickV8ParticleData::~QQuickV8ParticleData()
 
 QQmlV4Handle QQuickV8ParticleData::v4Value()
 {
-    return QQmlV4Handle::fromValue(m_v4Value);
+    return QQmlV4Handle(m_v4Value);
 }
 
 QT_END_NAMESPACE