aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/v8
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2014-11-01 23:50:32 +0100
committerSimon Hausmann <simon.hausmann@digia.com>2014-11-08 16:39:32 +0100
commitc2da8abde56d2010d3e7cb234570079f06d8a441 (patch)
treee3185e7f99c66130d615e855af3435ba102d51a4 /src/qml/qml/v8
parentda2396478f04aa66d521e53ff24488e72c87d895 (diff)
Move Object::Data into the Heap namespace
Change-Id: I9d30081f71b83bc86f5e5714e23396b18c4d54c5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8')
-rw-r--r--src/qml/qml/v8/qqmlbuiltinfunctions.cpp4
-rw-r--r--src/qml/qml/v8/qqmlbuiltinfunctions_p.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 4ab360eb9a..61fe2a4876 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -79,7 +79,7 @@ struct StaticQtMetaObject : public QObject
};
QV4::QtObject::Data::Data(ExecutionEngine *v4, QQmlEngine *qmlEngine)
- : Object::Data(v4)
+ : Heap::Object(v4)
{
setVTable(staticVTable());
@@ -1297,7 +1297,7 @@ ReturnedValue QtObject::method_get_inputMethod(CallContext *ctx)
QV4::ConsoleObject::Data::Data(ExecutionEngine *v4)
- : Object::Data(v4)
+ : Heap::Object(v4)
{
QV4::Scope scope(v4);
QV4::ScopedObject o(scope, this);
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
index 19b30bcc86..a21ae0afd3 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions_p.h
@@ -57,7 +57,7 @@ namespace QV4 {
struct QtObject : Object
{
- struct Data : Object::Data {
+ struct Data : Heap::Object {
Data(ExecutionEngine *v4, QQmlEngine *qmlEngine);
QObject *platform;
QObject *application;
@@ -105,7 +105,7 @@ struct QtObject : Object
struct ConsoleObject : Object
{
- struct Data : Object::Data {
+ struct Data : Heap::Object {
Data(ExecutionEngine *engine);
};