From a6c36616b0ccf9c1aeb71d90437c9226ae76fe10 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 31 Dec 2014 13:21:39 +0100 Subject: Move extension mechanism over to use the v4 engine Change-Id: Ib329fc7bcae3c78d962a116f53b2244a71f81228 Reviewed-by: Simon Hausmann --- src/particles/qquickv4particledata.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/particles/qquickv4particledata.cpp') diff --git a/src/particles/qquickv4particledata.cpp b/src/particles/qquickv4particledata.cpp index 660bc7c11c..b9cf926052 100644 --- a/src/particles/qquickv4particledata.cpp +++ b/src/particles/qquickv4particledata.cpp @@ -279,11 +279,11 @@ struct QV4ParticleData : public QV4::Object DEFINE_OBJECT_VTABLE(QV4ParticleData); -class QV8ParticleDataDeletable : public QV8Engine::Deletable +class QV4ParticleDataDeletable : public QV8Engine::Deletable { public: - QV8ParticleDataDeletable(QV8Engine *engine); - ~QV8ParticleDataDeletable(); + QV4ParticleDataDeletable(QV4::ExecutionEngine *engine); + ~QV4ParticleDataDeletable(); QV4::PersistentValue proto; }; @@ -445,9 +445,8 @@ FAKE_FLOAT_GETTER_AND_SETTER(curY, curY, setInstantaneousY) FAKE_FLOAT_GETTER_AND_SETTER(curVY, curVY, setInstantaneousVY) FAKE_FLOAT_GETTER_AND_SETTER(curAY, curAY, setInstantaneousAY) -QV8ParticleDataDeletable::QV8ParticleDataDeletable(QV8Engine *engine) +QV4ParticleDataDeletable::QV4ParticleDataDeletable(QV4::ExecutionEngine *v4) { - QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine); QV4::Scope scope(v4); QV4::ScopedObject p(scope, v4->newObject()); @@ -493,11 +492,11 @@ QV8ParticleDataDeletable::QV8ParticleDataDeletable(QV8Engine *engine) proto = p; } -QV8ParticleDataDeletable::~QV8ParticleDataDeletable() +QV4ParticleDataDeletable::~QV4ParticleDataDeletable() { } -V8_DEFINE_EXTENSION(QV8ParticleDataDeletable, particleV8Data); +V4_DEFINE_EXTENSION(QV4ParticleDataDeletable, particleV4Data); QQuickV4ParticleData::QQuickV4ParticleData(QV8Engine* engine, QQuickParticleData* datum) @@ -505,9 +504,9 @@ QQuickV4ParticleData::QQuickV4ParticleData(QV8Engine* engine, QQuickParticleData if (!engine || !datum) return; - QV8ParticleDataDeletable *d = particleV8Data(engine); QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine); QV4::Scope scope(v4); + QV4ParticleDataDeletable *d = particleV4Data(scope.engine); QV4::ScopedObject o(scope, v4->memoryManager->alloc(v4, datum)); QV4::ScopedObject p(scope, d->proto.value()); o->setPrototype(p); -- cgit v1.2.3