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>

4 files changed, 0 insertions, 12 deletions

diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp
index eb403ff6d..0e72cba6b 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader.cpp
+++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp
@@ -100,11 +100,6 @@ Quick3DEntityLoader::Quick3DEntityLoader(QNode *parent)
 {
 }
 
-Quick3DEntityLoader::~Quick3DEntityLoader()
-{
-    QNode::cleanup();
-}
-
 /*!
     \qmlproperty QtQml::QtObject Qt3DCore::EntityLoader::entity
     \readonly
diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p.h
index e83c29884..fe470653f 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader_p.h
+++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h
@@ -76,7 +76,6 @@ class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DEntityLoader : public QEntity
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
 public:
     explicit Quick3DEntityLoader(QNode *parent = 0);
-    ~Quick3DEntityLoader();
 
     QObject *entity() const;
 
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
index 32a82ad98..aff179f17 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
@@ -244,11 +244,6 @@ Quick3DNodeInstantiator::Quick3DNodeInstantiator(QNode *parent)
 {
 }
 
-Quick3DNodeInstantiator::~Quick3DNodeInstantiator()
-{
-    QNode::cleanup();
-}
-
 /*!
     \qmlsignal Qt3D.Core::NodeInstantiator::objectAdded(int index, QtObject node)
 
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
index 9485b5bbd..d1fc88147 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p.h
@@ -80,7 +80,6 @@ class QT3DQUICKSHARED_PRIVATE_EXPORT Quick3DNodeInstantiator : public QNode, pub
 
 public:
     Quick3DNodeInstantiator(QNode *parent = 0);
-    ~Quick3DNodeInstantiator();
 
     bool isActive() const;
     void setActive(bool newVal);