diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-01 23:50:32 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-08 16:39:32 +0100 |
| commit | c2da8abde56d2010d3e7cb234570079f06d8a441 (patch) | |
| tree | e3185e7f99c66130d615e855af3435ba102d51a4 /src/qml/jsruntime/qv4script.cpp | |
| parent | da2396478f04aa66d521e53ff24488e72c87d895 (diff) | |
Move Object::Data into the Heap namespace
Change-Id: I9d30081f71b83bc86f5e5714e23396b18c4d54c5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4script.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4script.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index a85cb8f883..da6503c1ab 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -53,7 +53,7 @@ using namespace QV4; -QmlBindingWrapper::Data::Data(ExecutionContext *scope, Function *f, Object *qml) +QmlBindingWrapper::Data::Data(ExecutionContext *scope, Function *f, QV4::Object *qml) : FunctionObject::Data(scope, scope->d()->engine->id_eval, /*createProto = */ false) , qml(qml) { @@ -74,7 +74,7 @@ QmlBindingWrapper::Data::Data(ExecutionContext *scope, Function *f, Object *qml) s.engine->popContext(); } -QmlBindingWrapper::Data::Data(ExecutionContext *scope, Object *qml) +QmlBindingWrapper::Data::Data(ExecutionContext *scope, QV4::Object *qml) : FunctionObject::Data(scope, scope->d()->engine->id_eval, /*createProto = */ false) , qml(qml) { @@ -158,9 +158,9 @@ DEFINE_OBJECT_VTABLE(QmlBindingWrapper); struct CompilationUnitHolder : public Object { - struct Data : Object::Data { + struct Data : Heap::Object { Data(ExecutionEngine *engine, CompiledData::CompilationUnit *unit) - : Object::Data(engine) + : Heap::Object(engine) , unit(unit) { setVTable(staticVTable()); |