Properly initialize q_ptr (or avoid where it is not needed)

Referencing a partially-constructed object is typically a bad design.

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

2 files changed, 3 insertions, 7 deletions

diff --git a/src/core/resources/qframeallocator.cpp b/src/core/resources/qframeallocator.cpp
index ead5a790e..c62e7ad0d 100644
--- a/src/core/resources/qframeallocator.cpp
+++ b/src/core/resources/qframeallocator.cpp
@@ -53,13 +53,12 @@ namespace Qt3D {
     \class Qt3D::QFrameAllocatorPrivate
     \internal
 */
-QFrameAllocatorPrivate::QFrameAllocatorPrivate(QFrameAllocator *qq)
-    : q_ptr(qq)
+QFrameAllocatorPrivate::QFrameAllocatorPrivate()
 {
 }
 
 QFrameAllocator::QFrameAllocator(uint maxObjectSize, uint alignment, uint pageSize)
-    : d_ptr(new QFrameAllocatorPrivate(this))
+    : d_ptr(new QFrameAllocatorPrivate)
 {
     Q_ASSERT(alignment && pageSize && pageSize < UCHAR_MAX);
     Q_D(QFrameAllocator);
diff --git a/src/core/resources/qframeallocator_p.h b/src/core/resources/qframeallocator_p.h
index dbf68ea63..990066138 100644
--- a/src/core/resources/qframeallocator_p.h
+++ b/src/core/resources/qframeallocator_p.h
@@ -91,7 +91,7 @@ private:
 class QFrameAllocatorPrivate
 {
 public:
-    QFrameAllocatorPrivate(QFrameAllocator *qq);
+    QFrameAllocatorPrivate();
 
     inline void *allocateAtChunk(uint allocatorIndex)
     {
@@ -108,9 +108,6 @@ public:
         return (targetSize + m_alignment - 1) / m_alignment - 1;
     }
 
-    Q_DECLARE_PUBLIC(QFrameAllocator)
-    QFrameAllocator *q_ptr;
-
     uint m_maxObjectSize;
     uint m_alignment;
     QVector<QFixedFrameAllocator> m_allocatorPool;