Rename QQmlV8Handle to QQmlV4Handle

The handle wraps a V4 Value, so this is the better name for it.
Also added some accessor methods to convert to and from V4
Values.

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

10 files changed, 21 insertions, 21 deletions

diff --git a/src/particles/qquickcustomaffector.cpp b/src/particles/qquickcustomaffector.cpp
index 99984bf804..c7fc7a7830 100644
--- a/src/particles/qquickcustomaffector.cpp
+++ b/src/particles/qquickcustomaffector.cpp
@@ -103,7 +103,7 @@ QQuickCustomAffector::QQuickCustomAffector(QQuickItem *parent) :
 
 bool QQuickCustomAffector::isAffectConnected()
 {
-    IS_SIGNAL_CONNECTED(this, QQuickCustomAffector, affectParticles, (QQmlV8Handle,qreal));
+    IS_SIGNAL_CONNECTED(this, QQuickCustomAffector, affectParticles, (QQmlV4Handle,qreal));
 }
 
 void QQuickCustomAffector::affectSystem(qreal dt)
@@ -147,11 +147,11 @@ void QQuickCustomAffector::affectSystem(qreal dt)
     v8::Context::Scope scope(QQmlEnginePrivate::getV8Engine(qmlEngine(this))->context());
     v8::Handle<v8::Array> array = v8::Array::New(toAffect.size());
     for (int i=0; i<toAffect.size(); i++)
-        array->Set(i, toAffect[i]->v8Value().toHandle());
+        array->Set(i, toAffect[i]->v8Value().toV8Handle());
 
     if (dt >= simulationCutoff || dt <= simulationDelta) {
         affectProperties(toAffect, dt);
-        emit affectParticles(QQmlV8Handle::fromHandle(array), dt);
+        emit affectParticles(QQmlV4Handle::fromV8Handle(array), dt);
     } else {
         int realTime = m_system->timeInt;
         m_system->timeInt -= dt * 1000.0;
@@ -159,12 +159,12 @@ void QQuickCustomAffector::affectSystem(qreal dt)
             m_system->timeInt += simulationDelta * 1000.0;
             dt -= simulationDelta;
             affectProperties(toAffect, simulationDelta);
-            emit affectParticles(QQmlV8Handle::fromHandle(array), simulationDelta);
+            emit affectParticles(QQmlV4Handle::fromV8Handle(array), simulationDelta);
         }
         m_system->timeInt = realTime;
         if (dt > 0.0) {
             affectProperties(toAffect, dt);
-            emit affectParticles(QQmlV8Handle::fromHandle(array), dt);
+            emit affectParticles(QQmlV4Handle::fromV8Handle(array), dt);
         }
     }
 
diff --git a/src/particles/qquickcustomaffector_p.h b/src/particles/qquickcustomaffector_p.h
index a4a077f864..1a12684c48 100644
--- a/src/particles/qquickcustomaffector_p.h
+++ b/src/particles/qquickcustomaffector_p.h
@@ -99,7 +99,7 @@ public:
 
 
 signals:
-    void affectParticles(QQmlV8Handle particles, qreal dt);
+    void affectParticles(QQmlV4Handle particles, qreal dt);
 
     void positionChanged(QQuickDirection * arg);
 
diff --git a/src/particles/qquickparticleemitter.cpp b/src/particles/qquickparticleemitter.cpp
index b4e3a82cb2..4177f873e2 100644
--- a/src/particles/qquickparticleemitter.cpp
+++ b/src/particles/qquickparticleemitter.cpp
@@ -256,7 +256,7 @@ QQuickParticleEmitter::~QQuickParticleEmitter()
 
 bool QQuickParticleEmitter::isEmitConnected()
 {
-    IS_SIGNAL_CONNECTED(this, QQuickParticleEmitter, emitParticles, (QQmlV8Handle));
+    IS_SIGNAL_CONNECTED(this, QQuickParticleEmitter, emitParticles, (QQmlV4Handle));
 }
 
 void QQuickParticleEmitter::componentComplete()
@@ -483,9 +483,9 @@ void QQuickParticleEmitter::emitWindow(int timeStamp)
         v8::Context::Scope scope(QQmlEnginePrivate::getV8Engine(qmlEngine(this))->context());
         v8::Handle<v8::Array> array = v8::Array::New(toEmit.size());
         for (int i=0; i<toEmit.size(); i++)
-            array->Set(i, toEmit[i]->v8Value().toHandle());
+            array->Set(i, toEmit[i]->v8Value().toV8Handle());
 
-        emitParticles(QQmlV8Handle::fromHandle(array));//A chance for arbitrary JS changes
+        emitParticles(QQmlV4Handle::fromV8Handle(array));//A chance for arbitrary JS changes
     }
 
     m_last_emission = pt;
diff --git a/src/particles/qquickparticleemitter_p.h b/src/particles/qquickparticleemitter_p.h
index 70de934f6d..051e27816d 100644
--- a/src/particles/qquickparticleemitter_p.h
+++ b/src/particles/qquickparticleemitter_p.h
@@ -119,7 +119,7 @@ public:
     void setVelocityFromMovement(qreal s);
     virtual void componentComplete();
 signals:
-    void emitParticles(QQmlV8Handle particles);
+    void emitParticles(QQmlV4Handle particles);
     void particlesPerSecondChanged(qreal);
     void particleDurationChanged(int);
     void enabledChanged(bool);
diff --git a/src/particles/qquickparticlesystem.cpp b/src/particles/qquickparticlesystem.cpp
index 1e59290ceb..2043eaffd3 100644
--- a/src/particles/qquickparticlesystem.cpp
+++ b/src/particles/qquickparticlesystem.cpp
@@ -527,7 +527,7 @@ void QQuickParticleData::clone(const QQuickParticleData& other)
     animationOwner = other.animationOwner;
 }
 
-QQmlV8Handle QQuickParticleData::v8Value()
+QQmlV4Handle QQuickParticleData::v8Value()
 {
     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 1177e30b8f..3b58fd139e 100644
--- a/src/particles/qquickparticlesystem_p.h
+++ b/src/particles/qquickparticlesystem_p.h
@@ -51,7 +51,7 @@
 #include <private/qquicksprite_p.h>
 #include <QAbstractAnimation>
 #include <QtQml/qqml.h>
-#include <private/qv8engine_p.h> //For QQmlV8Handle
+#include <private/qv8engine_p.h> //For QQmlV4Handle
 
 QT_BEGIN_NAMESPACE
 
@@ -228,7 +228,7 @@ public:
     float lifeLeft();
     float curSize();
     void clone(const QQuickParticleData& other);//Not =, leaves meta-data like index
-    QQmlV8Handle v8Value();
+    QQmlV4Handle v8Value();
     void extendLife(float time);
 private:
     QQuickV8ParticleData* v8Datum;
diff --git a/src/particles/qquicktrailemitter.cpp b/src/particles/qquicktrailemitter.cpp
index 8b14626b54..244e35bb00 100644
--- a/src/particles/qquicktrailemitter.cpp
+++ b/src/particles/qquicktrailemitter.cpp
@@ -129,7 +129,7 @@ QQuickTrailEmitter::QQuickTrailEmitter(QQuickItem *parent) :
 
 bool QQuickTrailEmitter::isEmitFollowConnected()
 {
-    IS_SIGNAL_CONNECTED(this, QQuickTrailEmitter, emitFollowParticles, (QQmlV8Handle,QQmlV8Handle));
+    IS_SIGNAL_CONNECTED(this, QQuickTrailEmitter, emitFollowParticles, (QQmlV4Handle,QQmlV4Handle));
 }
 
 void QQuickTrailEmitter::recalcParticlesPerSecond(){
@@ -273,12 +273,12 @@ void QQuickTrailEmitter::emitWindow(int timeStamp)
             v8::Context::Scope scope(QQmlEnginePrivate::getV8Engine(qmlEngine(this))->context());
             v8::Handle<v8::Array> array = v8::Array::New(toEmit.size());
             for (int i=0; i<toEmit.size(); i++)
-                array->Set(i, toEmit[i]->v8Value().toHandle());
+                array->Set(i, toEmit[i]->v8Value().toV8Handle());
 
             if (isEmitFollowConnected())
-                emitFollowParticles(QQmlV8Handle::fromHandle(array), d->v8Value());//A chance for many arbitrary JS changes
+                emitFollowParticles(QQmlV4Handle::fromV8Handle(array), d->v8Value());//A chance for many arbitrary JS changes
             else if (isEmitConnected())
-                emitParticles(QQmlV8Handle::fromHandle(array));//A chance for arbitrary JS changes
+                emitParticles(QQmlV4Handle::fromV8Handle(array));//A chance for arbitrary JS changes
         }
         m_lastEmission[d->index] = pt;
     }
diff --git a/src/particles/qquicktrailemitter_p.h b/src/particles/qquicktrailemitter_p.h
index 3ae1507f1a..54041f1751 100644
--- a/src/particles/qquicktrailemitter_p.h
+++ b/src/particles/qquicktrailemitter_p.h
@@ -91,7 +91,7 @@ public:
     }
 
 signals:
-    void emitFollowParticles(QQmlV8Handle particles, QQmlV8Handle followed);
+    void emitFollowParticles(QQmlV4Handle particles, QQmlV4Handle followed);
 
     void particlesPerParticlePerSecondChanged(int arg);
 
diff --git a/src/particles/qquickv8particledata.cpp b/src/particles/qquickv8particledata.cpp
index 44f992c163..6aec8d3008 100644
--- a/src/particles/qquickv8particledata.cpp
+++ b/src/particles/qquickv8particledata.cpp
@@ -498,9 +498,9 @@ QQuickV8ParticleData::~QQuickV8ParticleData()
     qPersistentDispose(m_v8Value);
 }
 
-QQmlV8Handle QQuickV8ParticleData::v8Value()
+QQmlV4Handle QQuickV8ParticleData::v8Value()
 {
-    return QQmlV8Handle::fromHandle(m_v8Value);
+    return QQmlV4Handle::fromV8Handle(m_v8Value);
 }
 
 QT_END_NAMESPACE
diff --git a/src/particles/qquickv8particledata_p.h b/src/particles/qquickv8particledata_p.h
index e3c1bf9324..8c4e2ced1c 100644
--- a/src/particles/qquickv8particledata_p.h
+++ b/src/particles/qquickv8particledata_p.h
@@ -51,7 +51,7 @@ class QQuickV8ParticleData {
 public:
     QQuickV8ParticleData(QV8Engine*,QQuickParticleData*);
     ~QQuickV8ParticleData();
-    QQmlV8Handle v8Value();
+    QQmlV4Handle v8Value();
 private:
     v8::Persistent<v8::Object> m_v8Value;
 };