diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2014-01-20 13:51:00 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-21 20:46:50 +0100 |
| commit | 7d4fc70e70ca566900c01aa7c5e3ec4770d15933 (patch) | |
| tree | 8b223bae1ab0604788abae489e87ec2fbd5298e8 /src/qml/jsruntime/qv4script.cpp | |
| parent | 3efae4fc7fff96f147f79013ef9fff9c31557229 (diff) | |
Split ManagedVTable into two classes
Keep the basic methods in ManagedVTable, but have
the Object related stuff in an ObjectVTable class.
Change-Id: I9b068acf3caef813686227b8d935e7df1a7d1a6e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4script.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4script.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index 4fd0569627..c50b025bc9 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -67,7 +67,7 @@ QmlBindingWrapper::QmlBindingWrapper(ExecutionContext *scope, Function *f, Objec { Q_ASSERT(scope->inUse); - setVTable(&static_vtbl); + setVTable(staticVTable()); function = f; function->compilationUnit->ref(); needsActivation = function->needsActivation(); @@ -88,7 +88,7 @@ QmlBindingWrapper::QmlBindingWrapper(ExecutionContext *scope, ObjectRef qml) { Q_ASSERT(scope->inUse); - setVTable(&static_vtbl); + setVTable(staticVTable()); function = 0; needsActivation = false; @@ -129,18 +129,18 @@ void QmlBindingWrapper::markObjects(Managed *m, ExecutionEngine *e) wrapper->qmlContext->mark(e); } -DEFINE_MANAGED_VTABLE(QmlBindingWrapper); +DEFINE_OBJECT_VTABLE(QmlBindingWrapper); struct CompilationUnitHolder : public QV4::Object { - Q_MANAGED + V4_OBJECT CompilationUnitHolder(ExecutionEngine *engine, CompiledData::CompilationUnit *unit) : Object(engine) , unit(unit) { unit->ref(); - setVTable(&static_vtbl); + setVTable(staticVTable()); } ~CompilationUnitHolder() { @@ -155,7 +155,7 @@ struct CompilationUnitHolder : public QV4::Object QV4::CompiledData::CompilationUnit *unit; }; -DEFINE_MANAGED_VTABLE(CompilationUnitHolder); +DEFINE_OBJECT_VTABLE(CompilationUnitHolder); Script::Script(ExecutionEngine *v4, ObjectRef qml, CompiledData::CompilationUnit *compilationUnit) : line(0), column(0), scope(v4->rootContext), strictMode(false), inheritContext(true), parsed(false) |