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>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index 9bb3b2b605..7f2f22780e 100644
--- a/src/qml/jsruntime/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
@@ -59,7 +59,7 @@ namespace QV4 {
 namespace Heap {
 
 struct CompilationUnitHolder : Object {
-    inline CompilationUnitHolder(ExecutionEngine *engine, CompiledData::CompilationUnit *unit);
+    inline CompilationUnitHolder(CompiledData::CompilationUnit *unit);
 
     QQmlRefPointer<CompiledData::CompilationUnit> unit;
 };
@@ -77,9 +77,8 @@ struct CompilationUnitHolder : public Object
 };
 
 inline
-Heap::CompilationUnitHolder::CompilationUnitHolder(ExecutionEngine *engine, CompiledData::CompilationUnit *unit)
-    : Heap::Object(engine)
-    , unit(unit)
+Heap::CompilationUnitHolder::CompilationUnitHolder(CompiledData::CompilationUnit *unit)
+    : unit(unit)
 {
 }
 
@@ -143,7 +142,7 @@ Script::Script(ExecutionEngine *v4, QmlContext *qml, CompiledData::CompilationUn
     vmFunction = compilationUnit ? compilationUnit->linkToEngine(v4) : 0;
     if (vmFunction) {
         Scope valueScope(v4);
-        ScopedObject holder(valueScope, v4->memoryManager->alloc<CompilationUnitHolder>(v4, compilationUnit));
+        ScopedObject holder(valueScope, v4->memoryManager->allocObject<CompilationUnitHolder>(compilationUnit));
         compilationUnitHolder.set(v4, holder);
     }
 }
@@ -214,7 +213,7 @@ void Script::parse()
             isel->setUseFastLookups(false);
         QQmlRefPointer<QV4::CompiledData::CompilationUnit> compilationUnit = isel->compile();
         vmFunction = compilationUnit->linkToEngine(v4);
-        ScopedObject holder(valueScope, v4->memoryManager->alloc<CompilationUnitHolder>(v4, compilationUnit));
+        ScopedObject holder(valueScope, v4->memoryManager->allocObject<CompilationUnitHolder>(compilationUnit));
         compilationUnitHolder.set(v4, holder);
     }