diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-05-08 22:27:23 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:17 +0200 |
| commit | 45f7120d42f628e86ae2bf3bd2789fdb190490e0 (patch) | |
| tree | 5a90ec2c80f46d20124cf4adac14704777301f46 /src/qml/jsruntime/qv4script.cpp | |
| parent | 4632c0bfff911fa84f00aab9721519427cfa9921 (diff) | |
Convert regexps
Change-Id: I5b62a265a7ce363a16b1e14ae93cadbb1ab0cb5b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4script.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4script.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index 635115ff0a..c397922c40 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -167,6 +167,17 @@ DEFINE_OBJECT_VTABLE(QmlBindingWrapper); struct CompilationUnitHolder : public Object { struct Data : Object::Data { + Data(ExecutionEngine *engine, CompiledData::CompilationUnit *unit) + : Object::Data(engine) + , unit(unit) + { + unit->ref(); + setVTable(staticVTable()); + } + ~Data() + { + unit->deref(); + } QV4::CompiledData::CompilationUnit *unit; }; struct { @@ -175,21 +186,10 @@ struct CompilationUnitHolder : public Object V4_OBJECT - CompilationUnitHolder(ExecutionEngine *engine, CompiledData::CompilationUnit *unit) - : Object(engine) - { - d()->unit = unit; - d()->unit->ref(); - setVTable(staticVTable()); - } - ~CompilationUnitHolder() - { - d()->unit->deref(); - } static void destroy(Managed *that) { - static_cast<CompilationUnitHolder*>(that)->~CompilationUnitHolder(); + static_cast<CompilationUnitHolder*>(that)->d()->~Data(); } }; @@ -206,7 +206,7 @@ Script::Script(ExecutionEngine *v4, Object *qml, CompiledData::CompilationUnit * vmFunction = compilationUnit->linkToEngine(v4); Q_ASSERT(vmFunction); Scope valueScope(v4); - ScopedValue holder(valueScope, new (v4->memoryManager) CompilationUnitHolder(v4, compilationUnit)); + ScopedObject holder(valueScope, new (v4) CompilationUnitHolder::Data(v4, compilationUnit)); compilationUnitHolder = holder.asReturnedValue(); } else vmFunction = 0; @@ -278,7 +278,7 @@ void Script::parse() isel->setUseFastLookups(false); QV4::CompiledData::CompilationUnit *compilationUnit = isel->compile(); vmFunction = compilationUnit->linkToEngine(v4); - ScopedValue holder(valueScope, new (v4->memoryManager) CompilationUnitHolder(v4, compilationUnit)); + ScopedObject holder(valueScope, new (v4) CompilationUnitHolder::Data(v4, compilationUnit)); compilationUnitHolder = holder.asReturnedValue(); } |