From 13edffa303c0a4514035857b4a61b2665ede7b2c Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 28 Aug 2015 13:33:10 +0200 Subject: Move remaining objects to new constructor syntax Also disable the old way of constructing objects. Change-Id: Ib4e69087cd563ae1481da116d6caf97876239798 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4engine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/jsruntime/qv4engine.cpp') diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index b3017e694d..9bd296166f 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -428,7 +428,7 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory) for (int i = 0; i < Heap::TypedArray::NTypes; ++i) { static_cast(typedArrayCtors[i]) = memoryManager->allocObject(global, Heap::TypedArray::Type(i)); - static_cast(typedArrayPrototype[i]) = memoryManager->alloc(this, Heap::TypedArray::Type(i)); + static_cast(typedArrayPrototype[i]) = memoryManager->allocObject(Heap::TypedArray::Type(i)); typedArrayPrototype[i].as()->init(this, static_cast(typedArrayCtors[i].as())); } @@ -742,7 +742,7 @@ Heap::Object *ExecutionEngine::newVariantObject(const QVariant &v) Heap::Object *ExecutionEngine::newForEachIteratorObject(Object *o) { Scope scope(this); - ScopedObject obj(scope, memoryManager->alloc(this, o)); + ScopedObject obj(scope, memoryManager->allocObject(o)); return obj->d(); } -- cgit v1.2.3