aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4qobjectwrapper.cpp
diff options
context:
space:
mode:
authorLars Knoll <[email protected]>2014-11-01 23:50:32 +0100
committerSimon Hausmann <[email protected]>2014-11-08 16:39:32 +0100
commitc2da8abde56d2010d3e7cb234570079f06d8a441 (patch)
treee3185e7f99c66130d615e855af3435ba102d51a4 /src/qml/jsruntime/qv4qobjectwrapper.cpp
parentda2396478f04aa66d521e53ff24488e72c87d895 (diff)
Move Object::Data into the Heap namespace
Change-Id: I9d30081f71b83bc86f5e5714e23396b18c4d54c5 Reviewed-by: Simon Hausmann <[email protected]>
Diffstat (limited to 'src/qml/jsruntime/qv4qobjectwrapper.cpp')
-rw-r--r--src/qml/jsruntime/qv4qobjectwrapper.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index 23ce1e118f..480d1231e8 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -234,7 +234,7 @@ static QV4::ReturnedValue LoadProperty(QV8Engine *engine, QObject *object,
}
QObjectWrapper::Data::Data(ExecutionEngine *engine, QObject *object)
- : Object::Data(engine)
+ : Heap::Object(engine)
, object(object)
{
setVTable(staticVTable());
@@ -1890,7 +1890,7 @@ ReturnedValue QObjectMethod::callInternal(CallData *callData)
DEFINE_OBJECT_VTABLE(QObjectMethod);
QmlSignalHandler::Data::Data(ExecutionEngine *engine, QObject *object, int signalIndex)
- : Object::Data(engine)
+ : Heap::Object(engine)
, object(object)
, signalIndex(signalIndex)
{