diff options
author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-13 21:38:25 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-21 19:32:23 +0100 |
commit | 2784a68d64519ccc5d01b6c1378207572cf1ebcd (patch) | |
tree | b66287687e7311a24253d60e18bcba829fb475ad /src/qml/qml/qqmltypewrapper_p.h | |
parent | 2cb6d1bf32e017026f618dcfdbef3980f5363656 (diff) |
Cleanup destruction of heap objects
Generate the code from a macro instead of duplicating boiler
plate code. Operate on Heap::Base instead of Managed.
Change-Id: I84c5a705980899be3e5b931a093645e50d3923bf
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 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/qml/qml/qqmltypewrapper_p.h b/src/qml/qml/qqmltypewrapper_p.h index a0a119630d..aff1fc0916 100644 --- a/src/qml/qml/qqmltypewrapper_p.h +++ b/src/qml/qml/qqmltypewrapper_p.h @@ -82,9 +82,7 @@ struct QmlTypeWrapper : Object { struct Q_QML_EXPORT QmlTypeWrapper : Object { V4_OBJECT2(QmlTypeWrapper, Object) -private: - -public: + V4_NEEDS_DESTROY bool isSingleton() const; QObject *singletonObject() const; @@ -100,8 +98,6 @@ public: static ReturnedValue get(Managed *m, String *name, bool *hasProperty); static void put(Managed *m, String *name, const ValueRef value); static PropertyAttributes query(const Managed *, String *name); - static void destroy(Managed *that); - static bool isEqualTo(Managed *that, Managed *o); }; |