QNode: make cleanup a private slot

QT3D_CLONEABLE now implements a default dtor that calls _q_ cleanup
QT3D_CLONEABLE_CUSTOM_DTOR is used for classes that really need to implement
their own dtor but they need to invoke _q_cleanup manually

Change-Id: I2937a3b9edeb5a763749f0044360d78ab4461a5e
Task-number: QTBUG-51464
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

10 files changed, 1 insertions, 46 deletions

diff --git a/src/render/geometry/qattribute.cpp b/src/render/geometry/qattribute.cpp
index d9467dd82..1d17b4bc9 100644
--- a/src/render/geometry/qattribute.cpp
+++ b/src/render/geometry/qattribute.cpp
@@ -115,14 +115,6 @@ QAttribute::QAttribute(QNode *parent)
 }
 
 /*!
- * Destroys the  attribute.
- */
-QAttribute::~QAttribute()
-{
-    QNode::cleanup();
-}
-
-/*!
  * Constructs a new QAttribute from \a buf of \a type, \a dataSize, \a count, \a offset,
  * and \a stride with \a parent.
  */
diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h
index 99da0f1d4..0252d7de5 100644
--- a/src/render/geometry/qattribute.h
+++ b/src/render/geometry/qattribute.h
@@ -41,7 +41,7 @@
 #define QT3DRENDER_QATTRIBUTE_H
 
 #include <Qt3DRender/qt3drender_global.h>
-#include <Qt3DCore/QNode>
+#include <Qt3DCore/qnode.h>
 #include <QtCore/QSharedPointer>
 
 QT_BEGIN_NAMESPACE
@@ -90,7 +90,6 @@ public:
     explicit QAttribute(QNode *parent = nullptr);
     explicit QAttribute(QBuffer *buf, VertexBaseType vertexBaseType, uint vertexSize, uint count, uint offset = 0, uint stride = 0, QNode *parent = nullptr);
     explicit QAttribute(QBuffer *buf, const QString &name, VertexBaseType vertexBaseType, uint vertexSize, uint count, uint offset = 0, uint stride = 0, QNode *parent = nullptr);
-    ~QAttribute();
 
     QBuffer *buffer() const;
     QString name() const;
diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp
index b5a0b99a0..1c7914fe2 100644
--- a/src/render/geometry/qbuffer.cpp
+++ b/src/render/geometry/qbuffer.cpp
@@ -154,14 +154,6 @@ QBuffer::QBuffer(QBuffer::BufferType ty, QNode *parent)
 }
 
 /*!
- * Destroys this buffer.
- */
-QBuffer::~QBuffer()
-{
-    QBuffer::cleanup();
-}
-
-/*!
  * \internal
  */
 void QBuffer::copy(const QNode *ref)
diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h
index ebb2d9a55..b9ee3e5c8 100644
--- a/src/render/geometry/qbuffer.h
+++ b/src/render/geometry/qbuffer.h
@@ -86,7 +86,6 @@ public:
     Q_ENUM(UsageType)
 
     explicit QBuffer(BufferType ty = QBuffer::VertexBuffer, Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QBuffer();
 
     UsageType usage() const;
     BufferType type() const;
diff --git a/src/render/geometry/qgeometry.cpp b/src/render/geometry/qgeometry.cpp
index 514003211..834d961ba 100644
--- a/src/render/geometry/qgeometry.cpp
+++ b/src/render/geometry/qgeometry.cpp
@@ -93,14 +93,6 @@ QGeometry::QGeometry(QGeometryPrivate &dd, QNode *parent)
 }
 
 /*!
- * Destroys this geometry.
- */
-QGeometry::~QGeometry()
-{
-    QNode::cleanup();
-}
-
-/*!
  * Adds an \a attribute to this geometry.
  */
 void QGeometry::addAttribute(QAttribute *attribute)
diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h
index b392d7866..f35d362a4 100644
--- a/src/render/geometry/qgeometry.h
+++ b/src/render/geometry/qgeometry.h
@@ -56,7 +56,6 @@ class QT3DRENDERSHARED_EXPORT QGeometry : public Qt3DCore::QNode
     Q_PROPERTY(Qt3DRender::QAttribute *boundingVolumePositionAttribute READ boundingVolumePositionAttribute WRITE setBoundingVolumePositionAttribute NOTIFY boundingVolumePositionAttributeChanged)
 public:
     explicit QGeometry(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QGeometry();
 
     QVector<QAttribute *> attributes() const;
     void addAttribute(QAttribute *attribute);
diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp
index 35146974d..1dc654aa6 100644
--- a/src/render/geometry/qgeometryrenderer.cpp
+++ b/src/render/geometry/qgeometryrenderer.cpp
@@ -159,14 +159,6 @@ QGeometryRenderer::QGeometryRenderer(QNode *parent)
 }
 
 /*!
- * Destroys this geometry renderer.
- */
-QGeometryRenderer::~QGeometryRenderer()
-{
-    QComponent::cleanup();
-}
-
-/*!
  * \internal
  */
 QGeometryRenderer::QGeometryRenderer(QGeometryRendererPrivate &dd, QNode *parent)
diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h
index 8a2e85459..6aab5a1c2 100644
--- a/src/render/geometry/qgeometryrenderer.h
+++ b/src/render/geometry/qgeometryrenderer.h
@@ -68,7 +68,6 @@ class QT3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent
 
 public:
     explicit QGeometryRenderer(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QGeometryRenderer();
 
     enum PrimitiveType {
         Points = 0x0000,
diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp
index ef9a793f9..72a0a13b6 100644
--- a/src/render/geometry/qmesh.cpp
+++ b/src/render/geometry/qmesh.cpp
@@ -107,14 +107,6 @@ QMesh::QMesh(QNode *parent)
 {
 }
 
-/*!
- * Destroys this mesh.
- */
-QMesh::~QMesh()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QMesh::QMesh(QMeshPrivate &dd, QNode *parent)
     : QGeometryRenderer(dd, parent)
diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h
index 36778f6ad..8b353a4ab 100644
--- a/src/render/geometry/qmesh.h
+++ b/src/render/geometry/qmesh.h
@@ -62,7 +62,6 @@ class QT3DRENDERSHARED_EXPORT QMesh : public QGeometryRenderer
 
 public:
     explicit QMesh(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QMesh();
 
     QUrl source() const;
     QString meshName() const;