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>

16 files changed, 0 insertions, 49 deletions

diff --git a/src/render/materialsystem/qeffect.cpp b/src/render/materialsystem/qeffect.cpp
index 89c356bad..27a39a619 100644
--- a/src/render/materialsystem/qeffect.cpp
+++ b/src/render/materialsystem/qeffect.cpp
@@ -60,11 +60,6 @@ QEffect::QEffect(QNode *parent)
 {
 }
 
-QEffect::~QEffect()
-{
-    QNode::cleanup();
-}
-
 void QEffect::copy(const QNode* ref)
 {
     QNode::copy(ref);
diff --git a/src/render/materialsystem/qeffect.h b/src/render/materialsystem/qeffect.h
index 647542c85..54e18454c 100644
--- a/src/render/materialsystem/qeffect.h
+++ b/src/render/materialsystem/qeffect.h
@@ -56,7 +56,6 @@ class QT3DRENDERSHARED_EXPORT QEffect : public Qt3DCore::QNode
     Q_OBJECT
 public:
     explicit QEffect(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QEffect();
 
     void addParameter(QParameter *parameter);
     void removeParameter(QParameter *parameter);
diff --git a/src/render/materialsystem/qfilterkey.cpp b/src/render/materialsystem/qfilterkey.cpp
index 5f947ca3a..332000db2 100644
--- a/src/render/materialsystem/qfilterkey.cpp
+++ b/src/render/materialsystem/qfilterkey.cpp
@@ -87,11 +87,6 @@ QFilterKey::QFilterKey(QNode *parent)
 {
 }
 
-QFilterKey::~QFilterKey()
-{
-    QNode::cleanup();
-}
-
 void QFilterKey::setValue(const QVariant &value)
 {
     Q_D(QFilterKey);
diff --git a/src/render/materialsystem/qfilterkey.h b/src/render/materialsystem/qfilterkey.h
index df4cdeedc..5bcd81a11 100644
--- a/src/render/materialsystem/qfilterkey.h
+++ b/src/render/materialsystem/qfilterkey.h
@@ -57,7 +57,6 @@ class QT3DRENDERSHARED_EXPORT QFilterKey : public Qt3DCore::QNode
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
 public:
     explicit QFilterKey(Qt3DCore::QNode *parent = nullptr);
-    ~QFilterKey();
 
     QVariant value() const;
     QString name() const;
diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp
index 4f2baeeba..a9a6eabc0 100644
--- a/src/render/materialsystem/qmaterial.cpp
+++ b/src/render/materialsystem/qmaterial.cpp
@@ -100,11 +100,6 @@ QMaterial::QMaterial(QNode *parent)
 {
 }
 
-QMaterial::~QMaterial()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QMaterial::QMaterial(QMaterialPrivate &dd, QNode *parent)
     : QComponent(dd, parent)
diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h
index eadc4a0c9..b97f11b90 100644
--- a/src/render/materialsystem/qmaterial.h
+++ b/src/render/materialsystem/qmaterial.h
@@ -61,7 +61,6 @@ class QT3DRENDERSHARED_EXPORT QMaterial : public Qt3DCore::QComponent
 
 public:
     explicit QMaterial(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QMaterial();
 
     QEffect *effect() const;
 
diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp
index a0064cf69..ba4eb5895 100644
--- a/src/render/materialsystem/qparameter.cpp
+++ b/src/render/materialsystem/qparameter.cpp
@@ -84,11 +84,6 @@ QParameter::QParameter(QNode *parent)
 {
 }
 
-QParameter::~QParameter()
-{
-    QNode::cleanup();
-}
-
 QParameter::QParameter(const QString &name, const QVariant &value, QNode *parent)
     : QNode(*new QParameterPrivate, parent)
 {
diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h
index 717b9bc0f..1ec5bc556 100644
--- a/src/render/materialsystem/qparameter.h
+++ b/src/render/materialsystem/qparameter.h
@@ -59,8 +59,6 @@ class QT3DRENDERSHARED_EXPORT QParameter : public Qt3DCore::QNode
 
 public:
     explicit QParameter(Qt3DCore::QNode *parent = nullptr);
-    ~QParameter();
-
     QParameter(const QString &name, const QVariant& value, Qt3DCore::QNode *parent = nullptr);
     QParameter(const QString &name, QAbstractTexture *texture, Qt3DCore::QNode *parent = nullptr);
 
diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp
index 3e97c9a8e..66b39455e 100644
--- a/src/render/materialsystem/qrenderpass.cpp
+++ b/src/render/materialsystem/qrenderpass.cpp
@@ -77,11 +77,6 @@ QRenderPass::QRenderPass(QNode *parent)
 {
 }
 
-QRenderPass::~QRenderPass()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QRenderPass::QRenderPass(QRenderPassPrivate &dd, QNode *parent)
     : QNode(dd, parent)
diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h
index 143121e7f..971f01eee 100644
--- a/src/render/materialsystem/qrenderpass.h
+++ b/src/render/materialsystem/qrenderpass.h
@@ -66,7 +66,6 @@ class QT3DRENDERSHARED_EXPORT QRenderPass : public Qt3DCore::QNode
 
 public:
     explicit QRenderPass(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QRenderPass();
 
     QShaderProgram *shaderProgram() const;
 
diff --git a/src/render/materialsystem/qshaderdata.cpp b/src/render/materialsystem/qshaderdata.cpp
index d9d38252d..74f45bb09 100644
--- a/src/render/materialsystem/qshaderdata.cpp
+++ b/src/render/materialsystem/qshaderdata.cpp
@@ -76,11 +76,6 @@ QShaderData::QShaderData(QNode *parent)
 {
 }
 
-QShaderData::~QShaderData()
-{
-    QNode::cleanup();
-}
-
 PropertyReaderInterfacePtr QShaderData::propertyReader() const
 {
     Q_D(const QShaderData);
diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h
index cc03aee03..08b20f5cd 100644
--- a/src/render/materialsystem/qshaderdata.h
+++ b/src/render/materialsystem/qshaderdata.h
@@ -64,7 +64,6 @@ class QT3DRENDERSHARED_EXPORT QShaderData : public Qt3DCore::QComponent
     Q_OBJECT
 public:
     explicit QShaderData(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QShaderData();
 
     enum TransformType {
         ModelToEye = 0,
diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp
index 618dd45cc..612e89bdd 100644
--- a/src/render/materialsystem/qshaderprogram.cpp
+++ b/src/render/materialsystem/qshaderprogram.cpp
@@ -73,11 +73,6 @@ QShaderProgram::QShaderProgram(QNode *parent)
 {
 }
 
-QShaderProgram::~QShaderProgram()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QShaderProgram::QShaderProgram(QShaderProgramPrivate &dd, QNode *parent)
     : QNode(dd, parent)
diff --git a/src/render/materialsystem/qshaderprogram.h b/src/render/materialsystem/qshaderprogram.h
index ce200abbe..3e88c1f4c 100644
--- a/src/render/materialsystem/qshaderprogram.h
+++ b/src/render/materialsystem/qshaderprogram.h
@@ -61,7 +61,6 @@ class QT3DRENDERSHARED_EXPORT QShaderProgram : public Qt3DCore::QNode
 
 public:
     explicit QShaderProgram(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QShaderProgram();
 
     enum ShaderType {
         Vertex = 0,
diff --git a/src/render/materialsystem/qtechnique.cpp b/src/render/materialsystem/qtechnique.cpp
index 31666baeb..9f1ed61d0 100644
--- a/src/render/materialsystem/qtechnique.cpp
+++ b/src/render/materialsystem/qtechnique.cpp
@@ -66,11 +66,6 @@ QTechnique::QTechnique(QNode *parent)
     QObject::connect(&d->m_graphicsApiFilter, SIGNAL(graphicsApiFilterChanged()), this, SLOT(_q_graphicsApiFilterChanged()));
 }
 
-QTechnique::~QTechnique()
-{
-    QNode::cleanup();
-}
-
 /*! \internal */
 QTechnique::QTechnique(QTechniquePrivate &dd, QNode *parent)
     : QNode(dd, parent)
diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h
index 49c624154..90d0cbc5f 100644
--- a/src/render/materialsystem/qtechnique.h
+++ b/src/render/materialsystem/qtechnique.h
@@ -62,7 +62,6 @@ class QT3DRENDERSHARED_EXPORT QTechnique : public Qt3DCore::QNode
 
 public:
     explicit QTechnique(Qt3DCore::QNode *parent = Q_NULLPTR);
-    ~QTechnique();
 
     void addFilterKey(QFilterKey*criterion);
     void removeFilterKey(QFilterKey*criterion);