Do not initialize q_ptr in classes derived from QObjectPrivate

QObject does that behind the scenes, in a proper way.

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

4 files changed, 10 insertions, 14 deletions

diff --git a/src/render/backend/qrenderaspect.cpp b/src/render/backend/qrenderaspect.cpp
index 672578b29..3a98ccc07 100644
--- a/src/render/backend/qrenderaspect.cpp
+++ b/src/render/backend/qrenderaspect.cpp
@@ -120,8 +120,8 @@ namespace Qt3D {
     \class Qt3D::QRenderAspectPrivate
     \internal
 */
-QRenderAspectPrivate::QRenderAspectPrivate(QRenderAspect::RenderType type, QRenderAspect *qq)
-    : QAbstractAspectPrivate(qq)
+QRenderAspectPrivate::QRenderAspectPrivate(QRenderAspect::RenderType type)
+    : QAbstractAspectPrivate()
     , m_renderer(new Render::Renderer(type))
     , m_surfaceEventFilter(new Render::PlatformSurfaceFilter(m_renderer))
     , m_surface(Q_NULLPTR)
@@ -168,7 +168,7 @@ void QRenderAspectPrivate::setSurface(QSurface *surface)
 }
 
 QRenderAspect::QRenderAspect(QObject *parent)
-    : QAbstractAspect(*new QRenderAspectPrivate(Threaded, this), parent)
+    : QAbstractAspect(*new QRenderAspectPrivate(Threaded), parent)
 {
     // Won't return until the private RenderThread in Renderer has been created
     // The Renderer is set to wait the surface with a wait condition
@@ -177,7 +177,7 @@ QRenderAspect::QRenderAspect(QObject *parent)
 }
 
 QRenderAspect::QRenderAspect(QRenderAspect::RenderType type, QObject *parent)
-    : QAbstractAspect(*new QRenderAspectPrivate(type, this), parent)
+    : QAbstractAspect(*new QRenderAspectPrivate(type), parent)
 {
     registerBackendTypes();
 }
diff --git a/src/render/backend/qrenderaspect_p.h b/src/render/backend/qrenderaspect_p.h
index 302e2be44..3ef3c9326 100644
--- a/src/render/backend/qrenderaspect_p.h
+++ b/src/render/backend/qrenderaspect_p.h
@@ -57,7 +57,7 @@ class Renderer;
 
 class QRenderAspectPrivate : public QAbstractAspectPrivate
 {
-    QRenderAspectPrivate(QRenderAspect::RenderType type, QRenderAspect *qq);
+    QRenderAspectPrivate(QRenderAspect::RenderType type);
 
     Q_DECLARE_PUBLIC(QRenderAspect)
 
diff --git a/src/render/frontend/qopenglfilter.cpp b/src/render/frontend/qopenglfilter.cpp
index b4b16981d..2c57daa3f 100644
--- a/src/render/frontend/qopenglfilter.cpp
+++ b/src/render/frontend/qopenglfilter.cpp
@@ -45,15 +45,13 @@ namespace Qt3D {
 class QOpenGLFilterPrivate : public QObjectPrivate
 {
 public:
-
-    QOpenGLFilterPrivate(QOpenGLFilter *qq)
+    QOpenGLFilterPrivate()
         : QObjectPrivate()
         , m_api(QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL ? QOpenGLFilter::Desktop : QOpenGLFilter::ES)
         , m_profile(QOpenGLFilter::None) // matches all (no profile, core, compat)
         , m_minor(0)
         , m_major(0)
     {
-        q_ptr = qq;
     }
 
     Q_DECLARE_PUBLIC(QOpenGLFilter)
@@ -66,7 +64,7 @@ public:
 };
 
 QOpenGLFilter::QOpenGLFilter(QObject *parent)
-    : QObject(*new QOpenGLFilterPrivate(this), parent)
+    : QObject(*new QOpenGLFilterPrivate, parent)
 {
 }
 
diff --git a/src/render/frontend/qwrapmode.cpp b/src/render/frontend/qwrapmode.cpp
index e73ff6541..a040183c4 100644
--- a/src/render/frontend/qwrapmode.cpp
+++ b/src/render/frontend/qwrapmode.cpp
@@ -44,9 +44,8 @@ namespace Qt3D {
 class QTextureWrapModePrivate : public QObjectPrivate
 {
 public:
-    QTextureWrapModePrivate(QTextureWrapMode *qq)
+    QTextureWrapModePrivate()
         : QObjectPrivate()
-        , q_ptr(qq)
         , m_x(QTextureWrapMode::ClampToEdge)
         , m_y(QTextureWrapMode::ClampToEdge)
         , m_z(QTextureWrapMode::ClampToEdge)
@@ -54,7 +53,6 @@ public:
     }
 
     Q_DECLARE_PUBLIC(QTextureWrapMode)
-    QTextureWrapMode *q_ptr;
     QTextureWrapMode::WrapMode m_x;
     QTextureWrapMode::WrapMode m_y;
     QTextureWrapMode::WrapMode m_z;
@@ -69,7 +67,7 @@ public:
  */
 
 QTextureWrapMode::QTextureWrapMode(WrapMode wrapMode, QObject *parent)
-    : QObject(*new QTextureWrapModePrivate(this), parent)
+    : QObject(*new QTextureWrapModePrivate, parent)
 {
     d_func()->m_x = wrapMode;
     d_func()->m_y = wrapMode;
@@ -81,7 +79,7 @@ QTextureWrapMode::QTextureWrapMode(WrapMode wrapMode, QObject *parent)
     each dimension \a x, \a y \a z of the texture and \a parent as parent.
  */
 QTextureWrapMode::QTextureWrapMode(WrapMode x,WrapMode y, WrapMode z, QObject *parent)
-    : QObject(*new QTextureWrapModePrivate(this), parent)
+    : QObject(*new QTextureWrapModePrivate, parent)
 {
     d_func()->m_x = x;
     d_func()->m_y = y;