diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-08-28 13:33:10 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-09-22 08:20:13 +0000 |
commit | 13edffa303c0a4514035857b4a61b2665ede7b2c (patch) | |
tree | b284190179941285ca2397ab61c593a6e864ba91 /src/particles/qquickv4particledata.cpp | |
parent | 2a8de9d8d85c5ce3e9c61fd8c0e957521f6a0846 (diff) |
Move remaining objects to new constructor syntax
Also disable the old way of constructing objects.
Change-Id: Ib4e69087cd563ae1481da116d6caf97876239798
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/particles/qquickv4particledata.cpp')
-rw-r--r-- | src/particles/qquickv4particledata.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/particles/qquickv4particledata.cpp b/src/particles/qquickv4particledata.cpp index fcab455cce..876c7214b0 100644 --- a/src/particles/qquickv4particledata.cpp +++ b/src/particles/qquickv4particledata.cpp @@ -266,9 +266,8 @@ QT_BEGIN_NAMESPACE struct QV4ParticleData : public QV4::Object { struct Data : QV4::Object::Data { - Data(QV4::ExecutionEngine *engine, QQuickParticleData *datum) - : QV4::Heap::Object(engine) - , datum(datum) + Data(QQuickParticleData *datum) + : datum(datum) { } QQuickParticleData* datum;//TODO: Guard needed? @@ -506,7 +505,7 @@ QQuickV4ParticleData::QQuickV4ParticleData(QV8Engine* engine, QQuickParticleData QV4::ExecutionEngine *v4 = QV8Engine::getV4(engine); QV4::Scope scope(v4); QV4ParticleDataDeletable *d = particleV4Data(scope.engine); - QV4::ScopedObject o(scope, v4->memoryManager->alloc<QV4ParticleData>(v4, datum)); + QV4::ScopedObject o(scope, v4->memoryManager->allocObject<QV4ParticleData>(datum)); QV4::ScopedObject p(scope, d->proto.value()); o->setPrototype(p); m_v4Value = o; |