diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-07 02:06:42 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-10 17:15:22 +0100 |
commit | fcf0203aafe6db09751835ce54fc32f51fc77d5a (patch) | |
tree | f5354c56af10c320b40fff9da4bba500ea8a1653 /src/qml/qml/qqmltypewrapper_p.h | |
parent | 4838cc89f000a2f1db4da6401fc79a75a7b86ad7 (diff) |
Move data of more Qml related objects into Heap namespace.
Change-Id: Ifb3a7093351474d6feb2f64498b531c36fdf669b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmltypewrapper_p.h')
-rw-r--r-- | src/qml/qml/qqmltypewrapper_p.h | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/src/qml/qml/qqmltypewrapper_p.h b/src/qml/qml/qqmltypewrapper_p.h index 5ba92cd89c..a0a119630d 100644 --- a/src/qml/qml/qqmltypewrapper_p.h +++ b/src/qml/qml/qqmltypewrapper_p.h @@ -58,22 +58,30 @@ class QQmlTypeNameCache; namespace QV4 { +namespace Heap { + +struct QmlTypeWrapper : Object { + enum TypeNameMode { + IncludeEnums, + ExcludeEnums + }; + + QmlTypeWrapper(QV8Engine *engine); + ~QmlTypeWrapper(); + QV8Engine *v8; + TypeNameMode mode; + QPointer<QObject> object; + + QQmlType *type; + QQmlTypeNameCache *typeNamespace; + const void *importNamespace; +}; + +} + struct Q_QML_EXPORT QmlTypeWrapper : Object { - enum TypeNameMode { IncludeEnums, ExcludeEnums }; - - struct Data : Heap::Object { - Data(QV8Engine *engine); - ~Data(); - QV8Engine *v8; - TypeNameMode mode; - QPointer<QObject> object; - - QQmlType *type; - QQmlTypeNameCache *typeNamespace; - const void *importNamespace; - }; - V4_OBJECT(Object) + V4_OBJECT2(QmlTypeWrapper, Object) private: public: @@ -83,8 +91,10 @@ public: QVariant toVariant() const; - static ReturnedValue create(QV8Engine *, QObject *, QQmlType *, TypeNameMode = IncludeEnums); - static ReturnedValue create(QV8Engine *, QObject *, QQmlTypeNameCache *, const void *, TypeNameMode = IncludeEnums); + static ReturnedValue create(QV8Engine *, QObject *, QQmlType *, + Heap::QmlTypeWrapper::TypeNameMode = Heap::QmlTypeWrapper::IncludeEnums); + static ReturnedValue create(QV8Engine *, QObject *, QQmlTypeNameCache *, const void *, + Heap::QmlTypeWrapper::TypeNameMode = Heap::QmlTypeWrapper::IncludeEnums); static ReturnedValue get(Managed *m, String *name, bool *hasProperty); |