diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-04-19 10:59:41 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-04-19 13:07:10 +0200 |
commit | 3e08aa42497f7d264be039f31f4eedf639eda307 (patch) | |
tree | 871ee4f38715ab0111fe8e2c49756ca60390898e /src/particles/qquickcustomaffector.cpp | |
parent | 190b376859ae9709e887886fcbaa56d60495be66 (diff) |
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>
Diffstat (limited to 'src/particles/qquickcustomaffector.cpp')
-rw-r--r-- | src/particles/qquickcustomaffector.cpp | 10 |
1 files changed, 5 insertions, 5 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); } } |