From 2784a68d64519ccc5d01b6c1378207572cf1ebcd Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 13 Nov 2014 21:38:25 +0100 Subject: 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 --- src/qml/qml/qqmltypewrapper_p.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/qml/qml/qqmltypewrapper_p.h') 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); }; -- cgit v1.2.3