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>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index 2fe903bcc9..346e745234 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -187,14 +187,13 @@ QVariant QmlValueTypeWrapper::toVariant() const
     }
 }
 
-void QmlValueTypeWrapper::destroy(Managed *that)
+void QmlValueTypeWrapper::destroy(Heap::Base *that)
 {
-    Q_ASSERT(that->as<QmlValueTypeWrapper>());
-    QmlValueTypeWrapper *w = static_cast<QmlValueTypeWrapper *>(that);
-    if (w->d()->objectType == Heap::QmlValueTypeWrapper::Reference)
-        static_cast<QmlValueTypeReference *>(w)->d()->Heap::QmlValueTypeReference::~QmlValueTypeReference();
+    Heap::QmlValueTypeWrapper *w = static_cast<Heap::QmlValueTypeWrapper *>(that);
+    if (w->objectType == Heap::QmlValueTypeWrapper::Reference)
+        static_cast<Heap::QmlValueTypeReference *>(w)->Heap::QmlValueTypeReference::~QmlValueTypeReference();
     else
-        static_cast<QmlValueTypeCopy *>(w)->d()->Heap::QmlValueTypeCopy::~QmlValueTypeCopy();
+        static_cast<Heap::QmlValueTypeCopy *>(w)->Heap::QmlValueTypeCopy::~QmlValueTypeCopy();
 }
 
 bool QmlValueTypeWrapper::isEqualTo(Managed *m, Managed *other)