Do not pass `this` to Private c-tor

For classes derived from QNodePrivate, it is not used anymore.

Change-Id: I9573042500c2c7533687d251e72bac14cb793525
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

18 files changed, 36 insertions, 36 deletions

diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp
index 117f3ecbb..bb2f05c67 100644
--- a/src/render/defaults/qdiffusemapmaterial.cpp
+++ b/src/render/defaults/qdiffusemapmaterial.cpp
@@ -56,8 +56,8 @@ namespace Qt3D {
     \class Qt3D::QDiffuseMapMaterialPrivate
     \internal
 */
-QDiffuseMapMaterialPrivate::QDiffuseMapMaterialPrivate(QDiffuseMapMaterial *qq)
-    : QMaterialPrivate(qq)
+QDiffuseMapMaterialPrivate::QDiffuseMapMaterialPrivate()
+    : QMaterialPrivate()
     , m_diffuseMapEffect(new QEffect())
     , m_diffuseTexture(new QTexture2D())
     , m_ambientParameter(new QParameter(QStringLiteral("ka"), QColor::fromRgbF(0.05f, 0.05f, 0.05f, 1.0f)))
@@ -154,7 +154,7 @@ void QDiffuseMapMaterialPrivate::init()
  */
 
 QDiffuseMapMaterial::QDiffuseMapMaterial(QNode *parent)
-    : QMaterial(*new QDiffuseMapMaterialPrivate(this), parent)
+    : QMaterial(*new QDiffuseMapMaterialPrivate, parent)
 {
     Q_D(QDiffuseMapMaterial);
     QObject::connect(d->m_ambientParameter, SIGNAL(valueChanged()), this, SIGNAL(ambientChanged()));
diff --git a/src/render/defaults/qdiffusemapmaterial_p.h b/src/render/defaults/qdiffusemapmaterial_p.h
index d3005e201..7bda02b57 100644
--- a/src/render/defaults/qdiffusemapmaterial_p.h
+++ b/src/render/defaults/qdiffusemapmaterial_p.h
@@ -55,7 +55,7 @@ class QDiffuseMapMaterial;
 
 class QDiffuseMapMaterialPrivate : public QMaterialPrivate
 {
-    QDiffuseMapMaterialPrivate(QDiffuseMapMaterial *qq);
+    QDiffuseMapMaterialPrivate();
 
     void init();
 
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp
index 61fc5fa12..aa72cfece 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp
@@ -57,8 +57,8 @@ namespace Qt3D {
     \class Qt3D::QDiffuseSpecularMapMaterialPrivate
     \internal
 */
-QDiffuseSpecularMapMaterialPrivate::QDiffuseSpecularMapMaterialPrivate(QDiffuseSpecularMapMaterial *qq)
-    : QMaterialPrivate(qq)
+QDiffuseSpecularMapMaterialPrivate::QDiffuseSpecularMapMaterialPrivate()
+    : QMaterialPrivate()
     , m_diffuseSpecularMapEffect(new QEffect())
     , m_diffuseTexture(new QTexture2D())
     , m_specularTexture(new QTexture2D())
@@ -161,7 +161,7 @@ void QDiffuseSpecularMapMaterialPrivate::init()
     Constructs a new Qt3D::QDiffuseSpecularMapMaterial instance with parent object \a parent.
 */
 QDiffuseSpecularMapMaterial::QDiffuseSpecularMapMaterial(QNode *parent)
-    : QMaterial(*new QDiffuseSpecularMapMaterialPrivate(this), parent)
+    : QMaterial(*new QDiffuseSpecularMapMaterialPrivate, parent)
 {
     Q_D(QDiffuseSpecularMapMaterial);
     QObject::connect(d->m_ambientParameter, SIGNAL(valueChanged()), this, SIGNAL(ambientChanged()));
diff --git a/src/render/defaults/qdiffusespecularmapmaterial_p.h b/src/render/defaults/qdiffusespecularmapmaterial_p.h
index 00d8edc1d..72ab20e83 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial_p.h
+++ b/src/render/defaults/qdiffusespecularmapmaterial_p.h
@@ -56,7 +56,7 @@ class QDiffuseSpecularMapMaterial;
 class QDiffuseSpecularMapMaterialPrivate : public QMaterialPrivate
 {
 public:
-    QDiffuseSpecularMapMaterialPrivate(QDiffuseSpecularMapMaterial *qq);
+    QDiffuseSpecularMapMaterialPrivate();
 
     void init();
 
diff --git a/src/render/defaults/qforwardrenderer.cpp b/src/render/defaults/qforwardrenderer.cpp
index f7d13515e..0daa26143 100644
--- a/src/render/defaults/qforwardrenderer.cpp
+++ b/src/render/defaults/qforwardrenderer.cpp
@@ -50,8 +50,8 @@ namespace Qt3D {
     \class Qt3D::QForwardRendererPrivate
     \internal
 */
-QForwardRendererPrivate::QForwardRendererPrivate(QForwardRenderer *qq)
-    : QTechniqueFilterPrivate(qq)
+QForwardRendererPrivate::QForwardRendererPrivate()
+    : QTechniqueFilterPrivate()
     , m_viewport(new QViewport())
     , m_cameraSelector(new QCameraSelector())
     , m_clearBuffer(new QClearBuffer())
@@ -98,7 +98,7 @@ void QForwardRendererPrivate::init()
     Constructs a new Qt3D::QForwardRenderer instance with parent object \a parent.
  */
 QForwardRenderer::QForwardRenderer(QNode *parent)
-    : QTechniqueFilter(*new QForwardRendererPrivate(this), parent)
+    : QTechniqueFilter(*new QForwardRendererPrivate, parent)
 {
     Q_D(QForwardRenderer);
     QObject::connect(d->m_viewport, SIGNAL(clearColorChanged()), this, SIGNAL(clearColorChanged()));
diff --git a/src/render/defaults/qforwardrenderer_p.h b/src/render/defaults/qforwardrenderer_p.h
index d9566fa5c..e0762e9c8 100644
--- a/src/render/defaults/qforwardrenderer_p.h
+++ b/src/render/defaults/qforwardrenderer_p.h
@@ -51,7 +51,7 @@ class QCameraSelector;
 class QForwardRendererPrivate: public QTechniqueFilterPrivate
 {
 public:
-    QForwardRendererPrivate(QForwardRenderer *qq);
+    QForwardRendererPrivate();
 
     QViewport *m_viewport;
     QCameraSelector *m_cameraSelector;
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
index 09b2f951a..88b9280f4 100644
--- a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
+++ b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
@@ -60,8 +60,8 @@ namespace Qt3D {
     \class Qt3D::QNormalDiffuseMapAlphaMaterialPrivate
     \internal
 */
-QNormalDiffuseMapAlphaMaterialPrivate::QNormalDiffuseMapAlphaMaterialPrivate(QNormalDiffuseMapAlphaMaterial *qq)
-    : QNormalDiffuseMapMaterialPrivate(qq)
+QNormalDiffuseMapAlphaMaterialPrivate::QNormalDiffuseMapAlphaMaterialPrivate()
+    : QNormalDiffuseMapMaterialPrivate()
     , m_alphaCoverage(new QAlphaCoverage())
     , m_depthTest(new QDepthTest())
 {
@@ -150,7 +150,7 @@ void QNormalDiffuseMapAlphaMaterialPrivate::init()
     Constructs a new Qt3D::QNormalDiffuseMapAlphaMaterial instance with parent object \a parent.
 */
 QNormalDiffuseMapAlphaMaterial::QNormalDiffuseMapAlphaMaterial(QNode *parent)
-    : QNormalDiffuseMapMaterial(*new QNormalDiffuseMapAlphaMaterialPrivate(this), parent)
+    : QNormalDiffuseMapMaterial(*new QNormalDiffuseMapAlphaMaterialPrivate, parent)
 {
 }
 
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial_p.h b/src/render/defaults/qnormaldiffusemapalphamaterial_p.h
index fb5fb5c73..bc3444fc6 100644
--- a/src/render/defaults/qnormaldiffusemapalphamaterial_p.h
+++ b/src/render/defaults/qnormaldiffusemapalphamaterial_p.h
@@ -51,7 +51,7 @@ class QDepthTest;
 class QNormalDiffuseMapAlphaMaterialPrivate: public QNormalDiffuseMapMaterialPrivate
 {
 public:
-    QNormalDiffuseMapAlphaMaterialPrivate(QNormalDiffuseMapAlphaMaterial *qq);
+    QNormalDiffuseMapAlphaMaterialPrivate();
 
     void init() Q_DECL_OVERRIDE;
 
diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/render/defaults/qnormaldiffusemapmaterial.cpp
index 01de6f4d5..461d24d76 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusemapmaterial.cpp
@@ -57,8 +57,8 @@ namespace Qt3D {
     \class Qt3D::QNormalDiffuseMapMaterialPrivate
     \internal
 */
-QNormalDiffuseMapMaterialPrivate::QNormalDiffuseMapMaterialPrivate(QNormalDiffuseMapMaterial *qq)
-    : QMaterialPrivate(qq)
+QNormalDiffuseMapMaterialPrivate::QNormalDiffuseMapMaterialPrivate()
+    : QMaterialPrivate()
     , m_normalDiffuseEffect(new QEffect())
     , m_diffuseTexture(new QTexture2D())
     , m_normalTexture(new QTexture2D())
@@ -162,7 +162,7 @@ void QNormalDiffuseMapMaterialPrivate::init()
     Constructs a new Qt3D::QNormalDiffuseMapMaterial instance with parent object \a parent.
 */
 QNormalDiffuseMapMaterial::QNormalDiffuseMapMaterial(QNode *parent)
-    : QMaterial(*new QNormalDiffuseMapMaterialPrivate(this), parent)
+    : QMaterial(*new QNormalDiffuseMapMaterialPrivate, parent)
 {
     Q_D(QNormalDiffuseMapMaterial);
     QObject::connect(d->m_ambientParameter, SIGNAL(valueChanged()), this, SIGNAL(ambientChanged()));
diff --git a/src/render/defaults/qnormaldiffusemapmaterial_p.h b/src/render/defaults/qnormaldiffusemapmaterial_p.h
index 2b92a3158..ccf986074 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial_p.h
+++ b/src/render/defaults/qnormaldiffusemapmaterial_p.h
@@ -56,7 +56,7 @@ class QNormalDiffuseMapMaterial;
 class QNormalDiffuseMapMaterialPrivate: public QMaterialPrivate
 {
 public:
-    QNormalDiffuseMapMaterialPrivate(QNormalDiffuseMapMaterial *qq);
+    QNormalDiffuseMapMaterialPrivate();
 
     virtual void init();
 
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
index 8f7441b9f..ce154e0cf 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
@@ -56,8 +56,8 @@ namespace Qt3D {
     \class Qt3D::QNormalDiffuseSpecularMapMaterialPrivate
     \internal
 */
-QNormalDiffuseSpecularMapMaterialPrivate::QNormalDiffuseSpecularMapMaterialPrivate(QNormalDiffuseSpecularMapMaterial *qq)
-    : QMaterialPrivate(qq)
+QNormalDiffuseSpecularMapMaterialPrivate::QNormalDiffuseSpecularMapMaterialPrivate()
+    : QMaterialPrivate()
     , m_normalDiffuseSpecularEffect(new QEffect())
     , m_diffuseTexture(new QTexture2D())
     , m_normalTexture(new QTexture2D())
@@ -168,7 +168,7 @@ void QNormalDiffuseSpecularMapMaterialPrivate::init()
     Constructs a new Qt3D::QNormalDiffuseSpecularMapMaterial instance with parent object \a parent.
 */
 QNormalDiffuseSpecularMapMaterial::QNormalDiffuseSpecularMapMaterial(QNode *parent)
-    : QMaterial(*new QNormalDiffuseSpecularMapMaterialPrivate(this), parent)
+    : QMaterial(*new QNormalDiffuseSpecularMapMaterialPrivate, parent)
 {
     Q_D(QNormalDiffuseSpecularMapMaterial);
     QObject::connect(d->m_ambientParameter, SIGNAL(valueChanged()), this, SIGNAL(ambientChanged()));
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h
index b18401078..82187eabc 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h
@@ -56,7 +56,7 @@ class QNormalDiffuseSpecularMapMaterial;
 class QNormalDiffuseSpecularMapMaterialPrivate : public QMaterialPrivate
 {
 public:
-    QNormalDiffuseSpecularMapMaterialPrivate(QNormalDiffuseSpecularMapMaterial *qq);
+    QNormalDiffuseSpecularMapMaterialPrivate();
 
     void init();
 
diff --git a/src/render/defaults/qpervertexcolormaterial.cpp b/src/render/defaults/qpervertexcolormaterial.cpp
index a3191f6b9..c1c68ce0e 100644
--- a/src/render/defaults/qpervertexcolormaterial.cpp
+++ b/src/render/defaults/qpervertexcolormaterial.cpp
@@ -55,8 +55,8 @@ namespace Qt3D {
     \class Qt3D::QPerVertexColorMaterialPrivate
     \internal
 */
-QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate(QPerVertexColorMaterial *qq)
-    : QMaterialPrivate(qq)
+QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate()
+    : QMaterialPrivate()
     , m_vertexEffect(new QEffect())
     , m_lightPositionParameter(new QParameter(QStringLiteral("lightPosition"), QVector4D(1.0f, 1.0f, 0.0f, 1.0f)))
     , m_lightIntensityParameter(new QParameter(QStringLiteral("lightIntensity"), QVector3D(1.0f, 1.0f, 1.0f)))
@@ -95,7 +95,7 @@ QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate(QPerVertexColorMa
     Constructs a new QPerVertexColorMaterial instance with parent object \a parent.
 */
 QPerVertexColorMaterial::QPerVertexColorMaterial(QNode *parent)
-    : QMaterial(*new QPerVertexColorMaterialPrivate(this), parent)
+    : QMaterial(*new QPerVertexColorMaterialPrivate, parent)
 {
     Q_D(QPerVertexColorMaterial);
     d->init();
diff --git a/src/render/defaults/qpervertexcolormaterial_p.h b/src/render/defaults/qpervertexcolormaterial_p.h
index 72a5d5b22..8fdd4ce95 100644
--- a/src/render/defaults/qpervertexcolormaterial_p.h
+++ b/src/render/defaults/qpervertexcolormaterial_p.h
@@ -55,7 +55,7 @@ class QPerVertexColorMaterial;
 class QPerVertexColorMaterialPrivate : public QMaterialPrivate
 {
 public:
-    QPerVertexColorMaterialPrivate(QPerVertexColorMaterial *qq);
+    QPerVertexColorMaterialPrivate();
 
     void init();
 
diff --git a/src/render/defaults/qphongmaterial.cpp b/src/render/defaults/qphongmaterial.cpp
index db2eb5456..43e9f298c 100644
--- a/src/render/defaults/qphongmaterial.cpp
+++ b/src/render/defaults/qphongmaterial.cpp
@@ -55,8 +55,8 @@ namespace Qt3D {
     \class Qt3D::QPhongMaterialPrivate
     \internal
 */
-QPhongMaterialPrivate::QPhongMaterialPrivate(QPhongMaterial *qq)
-    : QMaterialPrivate(qq)
+QPhongMaterialPrivate::QPhongMaterialPrivate()
+    : QMaterialPrivate()
     , m_phongEffect(new QEffect())
     , m_ambientParameter(new QParameter(QStringLiteral("ka"), QColor::fromRgbF(0.05f, 0.05f, 0.05f, 1.0f)))
     , m_diffuseParameter(new QParameter(QStringLiteral("kd"), QColor::fromRgbF(0.7f, 0.7f, 0.7f, 1.0f)))
@@ -101,7 +101,7 @@ QPhongMaterialPrivate::QPhongMaterialPrivate(QPhongMaterial *qq)
     Constructs a new QPhongMaterial instance with parent object \a parent.
 */
 QPhongMaterial::QPhongMaterial(QNode *parent)
-    : QMaterial(*new QPhongMaterialPrivate(this), parent)
+    : QMaterial(*new QPhongMaterialPrivate, parent)
 {
     Q_D(QPhongMaterial);
     QObject::connect(d->m_ambientParameter, SIGNAL(valueChanged()), this, SIGNAL(ambientChanged()));
diff --git a/src/render/defaults/qphongmaterial_p.h b/src/render/defaults/qphongmaterial_p.h
index b59f6c229..be6af94cd 100644
--- a/src/render/defaults/qphongmaterial_p.h
+++ b/src/render/defaults/qphongmaterial_p.h
@@ -55,7 +55,7 @@ class QPhongMaterial;
 class QPhongMaterialPrivate : public QMaterialPrivate
 {
 public:
-    QPhongMaterialPrivate(QPhongMaterial *qq);
+    QPhongMaterialPrivate();
 
     void init();
 
diff --git a/src/render/defaults/qskyboxentity.cpp b/src/render/defaults/qskyboxentity.cpp
index 40655a822..457fa746a 100644
--- a/src/render/defaults/qskyboxentity.cpp
+++ b/src/render/defaults/qskyboxentity.cpp
@@ -60,8 +60,8 @@ namespace Qt3D {
  * \class Qt3D::QSkyboxEntityPrivate
  * \internal
  */
-QSkyboxEntityPrivate::QSkyboxEntityPrivate(QSkyboxEntity *skyboxEntity)
-    : QEntityPrivate(skyboxEntity)
+QSkyboxEntityPrivate::QSkyboxEntityPrivate()
+    : QEntityPrivate()
     , m_effect(new QEffect())
     , m_material(new QMaterial())
     , m_skyboxTexture(new QTextureCubeMap())
@@ -205,7 +205,7 @@ void QSkyboxEntityPrivate::reloadTexture()
  * Constructs a new Qt3D::QSkyboxEntity object with \a parent as parent.
  */
 QSkyboxEntity::QSkyboxEntity(QNode *parent)
-    : QEntity(*new QSkyboxEntityPrivate(this), parent)
+    : QEntity(*new QSkyboxEntityPrivate, parent)
 {
     d_func()->init();
 }
diff --git a/src/render/defaults/qskyboxentity_p.h b/src/render/defaults/qskyboxentity_p.h
index 2be276fb3..a377dd520 100644
--- a/src/render/defaults/qskyboxentity_p.h
+++ b/src/render/defaults/qskyboxentity_p.h
@@ -59,7 +59,7 @@ class QEffect;
 
 class QSkyboxEntityPrivate : public QEntityPrivate
 {
-    QSkyboxEntityPrivate(QSkyboxEntity *skyboxEntity);
+    QSkyboxEntityPrivate();
 
     void init();
     void reloadTexture();