diff options
author | Lars Knoll <lars.knoll@digia.com> | 2014-04-29 16:54:07 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:49:06 +0200 |
commit | b6b88a63becc773a955b63021b32144b7b100ac6 (patch) | |
tree | df2ac39810c8b2bb4ee9d6926eb97533c269230d /src/qml/qml/qqmllistwrapper_p.h | |
parent | 053eb96c31a5d24ce8cda41dbb46b1df27e03bfb (diff) |
Convert list wrapper to new storage layout
Change-Id: Id360880d26444d84462e16e7401945d1160b4281
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmllistwrapper_p.h')
-rw-r--r-- | src/qml/qml/qqmllistwrapper_p.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/qml/qml/qqmllistwrapper_p.h b/src/qml/qml/qqmllistwrapper_p.h index a7ce8b30bf..b992df6d7e 100644 --- a/src/qml/qml/qqmllistwrapper_p.h +++ b/src/qml/qml/qqmllistwrapper_p.h @@ -69,7 +69,20 @@ namespace QV4 { struct Q_QML_EXPORT QmlListWrapper : Object { - V4_OBJECT + struct Data : Object::Data { + QV8Engine *v8; + QPointer<QObject> object; + QQmlListProperty<QObject> property; + int propertyType; + }; + struct { + QV8Engine *v8; + QPointer<QObject> object; + QQmlListProperty<QObject> property; + int propertyType; + } __data; + + V4_OBJECT_NEW protected: QmlListWrapper(QV8Engine *engine); ~QmlListWrapper(); @@ -86,13 +99,6 @@ public: static void put(Managed *m, const StringRef name, const ValueRef value); static void advanceIterator(Managed *m, ObjectIterator *it, StringRef name, uint *index, Property *p, PropertyAttributes *attributes); static void destroy(Managed *that); - -private: - QV8Engine *v8; - QPointer<QObject> object; - QQmlListProperty<QObject> property; - int propertyType; - }; } |