summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2015-05-18 06:19:13 +0400
committerKonstantin Ritt <ritt.ks@gmail.com>2015-05-20 05:55:10 +0000
commitbfae282e8fb6d6d83e92df712f93b583616169d9 (patch)
tree3c29f6ac29f3a679b6f02b632212384bf4df1018
parent5e28b995f5e43c6a908906966190f4ad594edede (diff)
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>
-rw-r--r--src/core/core-components/qcamera.cpp6
-rw-r--r--src/core/core-components/qcamera_p.h2
-rw-r--r--src/core/core-components/qcameralens.cpp6
-rw-r--r--src/core/core-components/qcameralens_p.h2
-rw-r--r--src/core/nodes/qcomponent.cpp6
-rw-r--r--src/core/nodes/qcomponent_p.h2
-rw-r--r--src/core/nodes/qentity.cpp7
-rw-r--r--src/core/nodes/qentity_p.h2
-rw-r--r--src/core/nodes/qnode.cpp3
-rw-r--r--src/core/nodes/qnode_p.h2
-rw-r--r--src/core/transforms/qtransform.cpp10
-rw-r--r--src/core/transforms/qtransform_p.h2
-rw-r--r--src/input/qkeyboardcontroller.cpp6
-rw-r--r--src/input/qkeyboardcontroller_p.h2
-rw-r--r--src/input/qkeyboardinput.cpp6
-rw-r--r--src/input/qkeyboardinput_p.h2
-rw-r--r--src/quick3d/quick3d/items/quick3dentityloader.cpp6
-rw-r--r--src/quick3d/quick3d/items/quick3dentityloader_p.h2
-rw-r--r--src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp6
-rw-r--r--src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h2
-rw-r--r--src/quick3d/quick3drenderer/items/quick3dparameter.cpp6
-rw-r--r--src/quick3d/quick3drenderer/items/quick3dparameter_p.h2
-rw-r--r--src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp2
-rw-r--r--src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp6
-rw-r--r--src/render/defaults/qdiffusemapmaterial.cpp6
-rw-r--r--src/render/defaults/qdiffusemapmaterial_p.h2
-rw-r--r--src/render/defaults/qdiffusespecularmapmaterial.cpp6
-rw-r--r--src/render/defaults/qdiffusespecularmapmaterial_p.h2
-rw-r--r--src/render/defaults/qforwardrenderer.cpp6
-rw-r--r--src/render/defaults/qforwardrenderer_p.h2
-rw-r--r--src/render/defaults/qnormaldiffusemapalphamaterial.cpp6
-rw-r--r--src/render/defaults/qnormaldiffusemapalphamaterial_p.h2
-rw-r--r--src/render/defaults/qnormaldiffusemapmaterial.cpp6
-rw-r--r--src/render/defaults/qnormaldiffusemapmaterial_p.h2
-rw-r--r--src/render/defaults/qnormaldiffusespecularmapmaterial.cpp6
-rw-r--r--src/render/defaults/qnormaldiffusespecularmapmaterial_p.h2
-rw-r--r--src/render/defaults/qpervertexcolormaterial.cpp6
-rw-r--r--src/render/defaults/qpervertexcolormaterial_p.h2
-rw-r--r--src/render/defaults/qphongmaterial.cpp6
-rw-r--r--src/render/defaults/qphongmaterial_p.h2
-rw-r--r--src/render/defaults/qskyboxentity.cpp6
-rw-r--r--src/render/defaults/qskyboxentity_p.h2
-rw-r--r--src/render/frontend/framegraph-components/qcameraselector.cpp6
-rw-r--r--src/render/frontend/framegraph-components/qcameraselector_p.h2
-rw-r--r--src/render/frontend/framegraph-components/qclearbuffer.cpp6
-rw-r--r--src/render/frontend/framegraph-components/qclearbuffer_p.h2
-rw-r--r--src/render/frontend/framegraph-components/qframegraph.cpp6
-rw-r--r--src/render/frontend/framegraph-components/qframegraph_p.h2
-rw-r--r--src/render/frontend/framegraph-components/qframegraphnode.cpp6
-rw-r--r--src/render/frontend/framegraph-components/qframegraphnode_p.h2
-rw-r--r--src/render/frontend/framegraph-components/qframegraphselector.cpp6
-rw-r--r--src/render/frontend/framegraph-components/qframegraphselector_p.h2
-rw-r--r--src/render/frontend/framegraph-components/qlayerfilter.cpp6
-rw-r--r--src/render/frontend/framegraph-components/qlayerfilter_p.h2
-rw-r--r--src/render/frontend/framegraph-components/qrenderpassfilter.cpp2
-rw-r--r--src/render/frontend/framegraph-components/qrenderpassfilter_p.h4
-rw-r--r--src/render/frontend/framegraph-components/qrendertargetselector.cpp6
-rw-r--r--src/render/frontend/framegraph-components/qrendertargetselector_p.h2
-rw-r--r--src/render/frontend/framegraph-components/qsortcriterion.cpp6
-rw-r--r--src/render/frontend/framegraph-components/qsortcriterion_p.h2
-rw-r--r--src/render/frontend/framegraph-components/qsortmethod.cpp6
-rw-r--r--src/render/frontend/framegraph-components/qsortmethod_p.h2
-rw-r--r--src/render/frontend/framegraph-components/qstateset.cpp6
-rw-r--r--src/render/frontend/framegraph-components/qstateset_p.h2
-rw-r--r--src/render/frontend/framegraph-components/qtechniquefilter.cpp6
-rw-r--r--src/render/frontend/framegraph-components/qtechniquefilter_p.h2
-rw-r--r--src/render/frontend/framegraph-components/qviewport.cpp6
-rw-r--r--src/render/frontend/framegraph-components/qviewport_p.h2
-rw-r--r--src/render/frontend/qabstractlight.cpp6
-rw-r--r--src/render/frontend/qabstractlight_p.h2
-rw-r--r--src/render/frontend/qabstractmesh.cpp6
-rw-r--r--src/render/frontend/qabstractmesh_p.h2
-rw-r--r--src/render/frontend/qabstractsceneloader.cpp6
-rw-r--r--src/render/frontend/qabstractsceneloader_p.h2
-rw-r--r--src/render/frontend/qabstracttextureimage.cpp2
-rw-r--r--src/render/frontend/qabstracttextureimage_p.h4
-rw-r--r--src/render/frontend/qabstracttextureprovider.cpp8
-rw-r--r--src/render/frontend/qabstracttextureprovider_p.h2
-rw-r--r--src/render/frontend/qalphacoverage.cpp6
-rw-r--r--src/render/frontend/qalphatest.cpp6
-rw-r--r--src/render/frontend/qannotation.cpp6
-rw-r--r--src/render/frontend/qannotation_p.h2
-rw-r--r--src/render/frontend/qblendequation.cpp6
-rw-r--r--src/render/frontend/qblendstate.cpp8
-rw-r--r--src/render/frontend/qcolormask.cpp6
-rw-r--r--src/render/frontend/qcuboidmesh.cpp6
-rw-r--r--src/render/frontend/qcuboidmesh_p.h2
-rw-r--r--src/render/frontend/qcullface.cpp6
-rw-r--r--src/render/frontend/qcylindermesh.cpp6
-rw-r--r--src/render/frontend/qdepthmask.cpp6
-rw-r--r--src/render/frontend/qdepthtest.cpp6
-rw-r--r--src/render/frontend/qdirectionallight.cpp6
-rw-r--r--src/render/frontend/qdirectionallight_p.h2
-rw-r--r--src/render/frontend/qdithering.cpp6
-rw-r--r--src/render/frontend/qeffect.cpp9
-rw-r--r--src/render/frontend/qeffect_p.h2
-rw-r--r--src/render/frontend/qfrontface.cpp6
-rw-r--r--src/render/frontend/qlayer.cpp6
-rw-r--r--src/render/frontend/qlayer_p.h2
-rw-r--r--src/render/frontend/qmaterial.cpp6
-rw-r--r--src/render/frontend/qmaterial_p.h2
-rw-r--r--src/render/frontend/qmesh.cpp9
-rw-r--r--src/render/frontend/qmesh_p.h2
-rw-r--r--src/render/frontend/qparameter.cpp10
-rw-r--r--src/render/frontend/qparameter_p.h2
-rw-r--r--src/render/frontend/qparametermapping.cpp8
-rw-r--r--src/render/frontend/qparametermapping_p.h2
-rw-r--r--src/render/frontend/qplanemesh.cpp6
-rw-r--r--src/render/frontend/qplanemesh_p.h2
-rw-r--r--src/render/frontend/qpointlight.cpp6
-rw-r--r--src/render/frontend/qpointlight_p.h2
-rw-r--r--src/render/frontend/qpolygonoffset.cpp6
-rw-r--r--src/render/frontend/qrenderattachment.cpp6
-rw-r--r--src/render/frontend/qrenderattachment_p.h2
-rw-r--r--src/render/frontend/qrenderpass.cpp6
-rw-r--r--src/render/frontend/qrenderpass_p.h2
-rw-r--r--src/render/frontend/qrenderstate.cpp4
-rw-r--r--src/render/frontend/qrenderstate_p.h3
-rw-r--r--src/render/frontend/qrendertarget.cpp6
-rw-r--r--src/render/frontend/qrendertarget_p.h2
-rw-r--r--src/render/frontend/qscissortest.cpp6
-rw-r--r--src/render/frontend/qshaderdata.cpp10
-rw-r--r--src/render/frontend/qshaderdata_p.h4
-rw-r--r--src/render/frontend/qshaderprogram.cpp6
-rw-r--r--src/render/frontend/qshaderprogram_p.h2
-rw-r--r--src/render/frontend/qspheremesh.cpp6
-rw-r--r--src/render/frontend/qspotlight.cpp6
-rw-r--r--src/render/frontend/qspotlight_p.h2
-rw-r--r--src/render/frontend/qstenciltest.cpp6
-rw-r--r--src/render/frontend/qtechnique.cpp6
-rw-r--r--src/render/frontend/qtechnique_p.h2
-rw-r--r--src/render/frontend/qtextureimage.cpp6
-rw-r--r--src/render/frontend/qtorusmesh.cpp6
-rw-r--r--src/render/io/gltfparser.cpp10
134 files changed, 296 insertions, 299 deletions
diff --git a/src/core/core-components/qcamera.cpp b/src/core/core-components/qcamera.cpp
index 2737daaa0..76d208cc9 100644
--- a/src/core/core-components/qcamera.cpp
+++ b/src/core/core-components/qcamera.cpp
@@ -45,8 +45,8 @@ namespace Qt3D {
\class Qt3D::QCameraPrivate
\internal
*/
-QCameraPrivate::QCameraPrivate(QCamera *qq)
- : QEntityPrivate(qq)
+QCameraPrivate::QCameraPrivate()
+ : QEntityPrivate()
, m_lens(new QCameraLens())
, m_transform(new QTransform())
, m_lookAt(new QLookAtTransform())
@@ -62,7 +62,7 @@ QCameraPrivate::QCameraPrivate(QCamera *qq)
*/
QCamera::QCamera(QNode *parent) :
- QEntity(*new QCameraPrivate(this), parent)
+ QEntity(*new QCameraPrivate, parent)
{
QObject::connect(d_func()->m_lens, SIGNAL(projectionTypeChanged()), this, SIGNAL(projectionMatrixChanged()));
QObject::connect(d_func()->m_lens, SIGNAL(nearPlaneChanged()), this, SIGNAL(nearPlaneChanged()));
diff --git a/src/core/core-components/qcamera_p.h b/src/core/core-components/qcamera_p.h
index e0b4c332d..1b6e5a85c 100644
--- a/src/core/core-components/qcamera_p.h
+++ b/src/core/core-components/qcamera_p.h
@@ -49,7 +49,7 @@ namespace Qt3D {
class QT3DCORESHARED_EXPORT QCameraPrivate : public QEntityPrivate
{
public:
- QCameraPrivate(QCamera *qq);
+ QCameraPrivate();
Q_DECLARE_PUBLIC(QCamera)
diff --git a/src/core/core-components/qcameralens.cpp b/src/core/core-components/qcameralens.cpp
index 23449d6cb..5fc43e5c3 100644
--- a/src/core/core-components/qcameralens.cpp
+++ b/src/core/core-components/qcameralens.cpp
@@ -45,8 +45,8 @@ namespace Qt3D {
\class Qt3D::QCameraLensPrivate
\internal
*/
-QCameraLensPrivate::QCameraLensPrivate(QCameraLens *qq)
- : QComponentPrivate(qq)
+QCameraLensPrivate::QCameraLensPrivate()
+ : QComponentPrivate()
, m_projectionType(QCameraLens::OrthogonalProjection)
, m_nearPlane(0.1f)
, m_farPlane(1024.0f)
@@ -60,7 +60,7 @@ QCameraLensPrivate::QCameraLensPrivate(QCameraLens *qq)
}
QCameraLens::QCameraLens(QNode *parent)
- : QComponent(*new QCameraLensPrivate(this), parent)
+ : QComponent(*new QCameraLensPrivate, parent)
{
Q_D(QCameraLens);
d->updateProjectionMatrix();
diff --git a/src/core/core-components/qcameralens_p.h b/src/core/core-components/qcameralens_p.h
index 10d1aaf8e..ec3b43c63 100644
--- a/src/core/core-components/qcameralens_p.h
+++ b/src/core/core-components/qcameralens_p.h
@@ -51,7 +51,7 @@ namespace Qt3D {
class QT3DCORESHARED_EXPORT QCameraLensPrivate : public QComponentPrivate
{
public:
- QCameraLensPrivate(QCameraLens *qq);
+ QCameraLensPrivate();
inline void updateProjectionMatrix()
{
diff --git a/src/core/nodes/qcomponent.cpp b/src/core/nodes/qcomponent.cpp
index 52fa77905..43ebfa768 100644
--- a/src/core/nodes/qcomponent.cpp
+++ b/src/core/nodes/qcomponent.cpp
@@ -49,8 +49,8 @@ namespace Qt3D {
\class Qt3D::QComponentPrivate
\internal
*/
-QComponentPrivate::QComponentPrivate(QComponent *qq)
- : QNodePrivate(qq)
+QComponentPrivate::QComponentPrivate()
+ : QNodePrivate()
, m_shareable(true)
, m_enabled(true)
{
@@ -110,7 +110,7 @@ void QComponentPrivate::removeEntity(QEntity *entity)
instance one of the subclasses instead.
*/
QComponent::QComponent(QNode *parent)
- : QNode(*new QComponentPrivate(this), parent)
+ : QNode(*new QComponentPrivate, parent)
{
}
diff --git a/src/core/nodes/qcomponent_p.h b/src/core/nodes/qcomponent_p.h
index 473d17d39..cc4849375 100644
--- a/src/core/nodes/qcomponent_p.h
+++ b/src/core/nodes/qcomponent_p.h
@@ -47,7 +47,7 @@ namespace Qt3D {
class QT3DCORESHARED_EXPORT QComponentPrivate : public QNodePrivate
{
public:
- explicit QComponentPrivate(QComponent *qq);
+ QComponentPrivate();
void addEntity(QEntity *entity);
void removeEntity(QEntity *entity);
diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp
index 8564317a3..e0aff9466 100644
--- a/src/core/nodes/qentity.cpp
+++ b/src/core/nodes/qentity.cpp
@@ -55,9 +55,8 @@ namespace Qt3D {
\class Qt3D::QEntityPrivate
\internal
*/
-
-QEntityPrivate::QEntityPrivate(QEntity *qq)
- : QNodePrivate(qq)
+QEntityPrivate::QEntityPrivate()
+ : QNodePrivate()
, m_enabled(true)
{}
@@ -84,7 +83,7 @@ QEntityPrivate::QEntityPrivate(QEntity *qq)
Constructs a new Qt3D::QEntity instance with \a parent as parent.
*/
QEntity::QEntity(QNode *parent)
- : QNode(*new QEntityPrivate(this), parent)
+ : QNode(*new QEntityPrivate, parent)
{
}
diff --git a/src/core/nodes/qentity_p.h b/src/core/nodes/qentity_p.h
index 1b70a9ed5..b28d0c391 100644
--- a/src/core/nodes/qentity_p.h
+++ b/src/core/nodes/qentity_p.h
@@ -48,7 +48,7 @@ namespace Qt3D {
class QT3DCORESHARED_EXPORT QEntityPrivate : public QNodePrivate
{
public :
- QEntityPrivate(QEntity *qq);
+ QEntityPrivate();
Q_DECLARE_PUBLIC(QEntity)
diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp
index 53b1e8f77..d6472cfd6 100644
--- a/src/core/nodes/qnode.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -58,7 +58,7 @@ QHash<QNodeId, QNode *> QNodePrivate::m_clonesLookupTable = QHash<QNodeId, QNode
\class Qt3D::QNodePrivate
\internal
*/
-QNodePrivate::QNodePrivate(QNode *qq)
+QNodePrivate::QNodePrivate()
: QObjectPrivate()
, m_changeArbiter(Q_NULLPTR)
, m_scene(Q_NULLPTR)
@@ -67,7 +67,6 @@ QNodePrivate::QNodePrivate(QNode *qq)
, m_propertyChangesSetup(false)
, m_signals(this)
{
- Q_UNUSED(qq) // ###
}
// Called by QEvent::childAdded (main thread)
diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h
index 34b413029..7e654bf7a 100644
--- a/src/core/nodes/qnode_p.h
+++ b/src/core/nodes/qnode_p.h
@@ -54,7 +54,7 @@ class QAspectEngine;
class QT3DCORESHARED_EXPORT QNodePrivate : public QObjectPrivate, public QObservableInterface
{
public:
- QNodePrivate(QNode *qq = Q_NULLPTR);
+ QNodePrivate();
void setScene(QSceneInterface *scene);
QSceneInterface *scene() const;
diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp
index 3e5a84b55..f9700b60f 100644
--- a/src/core/transforms/qtransform.cpp
+++ b/src/core/transforms/qtransform.cpp
@@ -48,8 +48,8 @@ namespace Qt3D {
\class Qt3D::QTransformPrivate
\internal
*/
-QTransformPrivate::QTransformPrivate(QTransform *qq)
- : QComponentPrivate(qq),
+QTransformPrivate::QTransformPrivate()
+ : QComponentPrivate(),
m_transformsDirty(false)
{
}
@@ -80,19 +80,19 @@ QMatrix4x4 QTransformPrivate::applyTransforms() const
QTransform::QTransform(QNode *parent)
- : Qt3D::QComponent(*new QTransformPrivate(this), parent)
+ : QComponent(*new QTransformPrivate, parent)
{
}
QTransform::QTransform(QList<QAbstractTransform *> transforms, QNode *parent)
- : Qt3D::QComponent(*new QTransformPrivate(this), parent)
+ : QComponent(*new QTransformPrivate, parent)
{
Q_FOREACH (QAbstractTransform *t, transforms)
addTransform(t);
}
QTransform::QTransform(QAbstractTransform *transform, QNode *parent)
- : Qt3D::QComponent(*new QTransformPrivate(this), parent)
+ : QComponent(*new QTransformPrivate, parent)
{
addTransform(transform);
}
diff --git a/src/core/transforms/qtransform_p.h b/src/core/transforms/qtransform_p.h
index ef2e86b1b..4c2f95d20 100644
--- a/src/core/transforms/qtransform_p.h
+++ b/src/core/transforms/qtransform_p.h
@@ -49,7 +49,7 @@ class QTransformPrivate : public QComponentPrivate
Q_DECLARE_PUBLIC(QTransform)
public:
- QTransformPrivate(QTransform *qq);
+ QTransformPrivate();
void _q_transformDestroyed(QObject *obj);
void _q_update();
diff --git a/src/input/qkeyboardcontroller.cpp b/src/input/qkeyboardcontroller.cpp
index 7e7a44215..69e93b479 100644
--- a/src/input/qkeyboardcontroller.cpp
+++ b/src/input/qkeyboardcontroller.cpp
@@ -48,13 +48,13 @@ namespace Qt3D {
\class Qt3D::QKeyboardControllerPrivate
\internal
*/
-QKeyboardControllerPrivate::QKeyboardControllerPrivate(QKeyboardController *qq)
- : QNodePrivate(qq)
+QKeyboardControllerPrivate::QKeyboardControllerPrivate()
+ : QNodePrivate()
{
}
QKeyboardController::QKeyboardController(QNode *parent)
- : QNode(*new QKeyboardControllerPrivate(this), parent)
+ : QNode(*new QKeyboardControllerPrivate, parent)
{
}
diff --git a/src/input/qkeyboardcontroller_p.h b/src/input/qkeyboardcontroller_p.h
index a6f18a6b4..a5888d648 100644
--- a/src/input/qkeyboardcontroller_p.h
+++ b/src/input/qkeyboardcontroller_p.h
@@ -49,7 +49,7 @@ class QKeyboardInput;
class QKeyboardControllerPrivate : public QNodePrivate
{
public:
- QKeyboardControllerPrivate(QKeyboardController *qq);
+ QKeyboardControllerPrivate();
Q_DECLARE_PUBLIC(QKeyboardController)
QKeyboardInput *m_activeInput;
diff --git a/src/input/qkeyboardinput.cpp b/src/input/qkeyboardinput.cpp
index 46b458995..e7030799d 100644
--- a/src/input/qkeyboardinput.cpp
+++ b/src/input/qkeyboardinput.cpp
@@ -47,8 +47,8 @@ namespace Qt3D {
\class Qt3D::QKeyboardInputPrivate
\internal
*/
-QKeyboardInputPrivate::QKeyboardInputPrivate(QKeyboardInput *qq)
- : QComponentPrivate(qq)
+QKeyboardInputPrivate::QKeyboardInputPrivate()
+ : QComponentPrivate()
, m_controller(Q_NULLPTR)
, m_focus(false)
{
@@ -59,7 +59,7 @@ QKeyboardInputPrivate::QKeyboardInputPrivate(QKeyboardInput *qq)
Constructs a new QKeyboardInput instance with parent \a parent.
*/
QKeyboardInput::QKeyboardInput(QNode *parent)
- : QComponent(*new QKeyboardInputPrivate(this), parent)
+ : QComponent(*new QKeyboardInputPrivate, parent)
{
}
diff --git a/src/input/qkeyboardinput_p.h b/src/input/qkeyboardinput_p.h
index 969708955..3f5a7edee 100644
--- a/src/input/qkeyboardinput_p.h
+++ b/src/input/qkeyboardinput_p.h
@@ -49,7 +49,7 @@ class QKeyboardController;
class QKeyboardInputPrivate : public QComponentPrivate
{
public:
- QKeyboardInputPrivate(QKeyboardInput *qq);
+ QKeyboardInputPrivate();
Q_DECLARE_PUBLIC(QKeyboardInput)
QKeyboardController *m_controller;
diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp
index 66c892d4a..224c6e6d2 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader.cpp
+++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp
@@ -81,7 +81,7 @@ private:
\since 5.5
*/
Quick3DEntityLoader::Quick3DEntityLoader(QNode *parent)
- : QEntity(*new Quick3DEntityLoaderPrivate(this), parent)
+ : QEntity(*new Quick3DEntityLoaderPrivate, parent)
{
}
@@ -130,8 +130,8 @@ void Quick3DEntityLoader::copy(const QNode *ref)
\class Qt3D::Quick::Quick3DEntityLoaderPrivate
\internal
*/
-Quick3DEntityLoaderPrivate::Quick3DEntityLoaderPrivate(Quick3DEntityLoader *qq)
- : QEntityPrivate(qq),
+Quick3DEntityLoaderPrivate::Quick3DEntityLoaderPrivate()
+ : QEntityPrivate(),
m_incubator(Q_NULLPTR),
m_context(Q_NULLPTR),
m_component(Q_NULLPTR),
diff --git a/src/quick3d/quick3d/items/quick3dentityloader_p.h b/src/quick3d/quick3d/items/quick3dentityloader_p.h
index 2026e3796..b00eecc7a 100644
--- a/src/quick3d/quick3d/items/quick3dentityloader_p.h
+++ b/src/quick3d/quick3d/items/quick3dentityloader_p.h
@@ -59,7 +59,7 @@ class Quick3DEntityLoaderIncubator;
class Quick3DEntityLoaderPrivate : public QEntityPrivate
{
public:
- Quick3DEntityLoaderPrivate(Quick3DEntityLoader *qq);
+ Quick3DEntityLoaderPrivate();
Q_DECLARE_PUBLIC(Quick3DEntityLoader)
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
index 0d34159d4..43c5b0f9e 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
@@ -54,8 +54,8 @@ namespace Quick {
\class Qt3D::Quick::Quick3DNodeInstantiatorPrivate
\internal
*/
-Quick3DNodeInstantiatorPrivate::Quick3DNodeInstantiatorPrivate(QNode *qq)
- : QNodePrivate(qq)
+Quick3DNodeInstantiatorPrivate::Quick3DNodeInstantiatorPrivate()
+ : QNodePrivate()
, m_componentComplete(true)
, m_effectiveReset(false)
, m_active(true)
@@ -212,7 +212,7 @@ void Quick3DNodeInstantiatorPrivate::makeModel()
*/
Quick3DNodeInstantiator::Quick3DNodeInstantiator(QNode *parent)
- : QNode(*(new Quick3DNodeInstantiatorPrivate(this)), parent)
+ : QNode(*new Quick3DNodeInstantiatorPrivate, parent)
{
}
diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h
index 274fa752d..30b8c84d8 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator_p_p.h
@@ -54,7 +54,7 @@ class Quick3DNodeInstantiatorPrivate : public QNodePrivate
Q_DECLARE_PUBLIC(Quick3DNodeInstantiator)
public:
- Quick3DNodeInstantiatorPrivate(QNode *qq);
+ Quick3DNodeInstantiatorPrivate();
~Quick3DNodeInstantiatorPrivate();
void clear();
diff --git a/src/quick3d/quick3drenderer/items/quick3dparameter.cpp b/src/quick3d/quick3drenderer/items/quick3dparameter.cpp
index 32e7c0d62..6f3b66212 100644
--- a/src/quick3d/quick3drenderer/items/quick3dparameter.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dparameter.cpp
@@ -54,8 +54,8 @@ const int qjsValueTypeId = qMetaTypeId<QJSValue>();
}
-Quick3DParameterPrivate::Quick3DParameterPrivate(Quick3DParameter *qq)
- : QParameterPrivate(qq)
+Quick3DParameterPrivate::Quick3DParameterPrivate()
+ : QParameterPrivate()
{
}
@@ -71,7 +71,7 @@ void Quick3DParameterPrivate::setValue(const QVariant &value)
}
Quick3DParameter::Quick3DParameter(QNode *parent)
- : QParameter(*new Quick3DParameterPrivate(this), parent)
+ : QParameter(*new Quick3DParameterPrivate, parent)
{
}
diff --git a/src/quick3d/quick3drenderer/items/quick3dparameter_p.h b/src/quick3d/quick3drenderer/items/quick3dparameter_p.h
index c0ccfe03b..bc715b49c 100644
--- a/src/quick3d/quick3drenderer/items/quick3dparameter_p.h
+++ b/src/quick3d/quick3drenderer/items/quick3dparameter_p.h
@@ -52,7 +52,7 @@ class Quick3DParameter;
class Quick3DParameterPrivate : public QParameterPrivate
{
public:
- Quick3DParameterPrivate(Quick3DParameter *qq);
+ Quick3DParameterPrivate();
Q_DECLARE_PUBLIC(Quick3DParameter)
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp b/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp
index 1efc3b679..58587ba2e 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dshaderdata.cpp
@@ -94,7 +94,7 @@ public:
};
Quick3DShaderData::Quick3DShaderData(QNode *parent)
- : QShaderData(*new QShaderDataPrivate(this, PropertyReaderInterfacePtr(new Quick3DShaderDataPropertyReader()))
+ : QShaderData(*new QShaderDataPrivate(PropertyReaderInterfacePtr(new Quick3DShaderDataPropertyReader()))
, parent)
{
}
diff --git a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp
index 47ab0f231..2b636a319 100644
--- a/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dshaderdataarray.cpp
@@ -48,15 +48,15 @@ namespace Quick {
class Quick3DShaderDataArrayPrivate : public QNodePrivate
{
public:
- Quick3DShaderDataArrayPrivate(Quick3DShaderDataArray *qq)
- : QNodePrivate(qq)
+ Quick3DShaderDataArrayPrivate()
+ : QNodePrivate()
{}
QList<QShaderData *> m_values;
};
Quick3DShaderDataArray::Quick3DShaderDataArray(QNode *parent)
- : QNode(*new Quick3DShaderDataArrayPrivate(this), parent)
+ : QNode(*new Quick3DShaderDataArrayPrivate, parent)
{
}
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();
diff --git a/src/render/frontend/framegraph-components/qcameraselector.cpp b/src/render/frontend/framegraph-components/qcameraselector.cpp
index 695ec37d2..b4dc83727 100644
--- a/src/render/frontend/framegraph-components/qcameraselector.cpp
+++ b/src/render/frontend/framegraph-components/qcameraselector.cpp
@@ -58,8 +58,8 @@ QCameraSelector::QCameraSelector(QCameraSelectorPrivate &dd, QNode *parent)
\class Qt3D::QCameraSelectorPrivate
\internal
*/
-QCameraSelectorPrivate::QCameraSelectorPrivate(Qt3D::QCameraSelector *qq)
- : QFrameGraphNodePrivate(qq)
+QCameraSelectorPrivate::QCameraSelectorPrivate()
+ : QFrameGraphNodePrivate()
, m_camera(Q_NULLPTR)
{}
@@ -73,7 +73,7 @@ void QCameraSelector::copy(const QNode *ref)
}
QCameraSelector::QCameraSelector(Qt3D::QNode *parent)
- : QFrameGraphNode(*new QCameraSelectorPrivate(this), parent)
+ : QFrameGraphNode(*new QCameraSelectorPrivate, parent)
{}
void QCameraSelector::setCamera(QEntity *camera)
diff --git a/src/render/frontend/framegraph-components/qcameraselector_p.h b/src/render/frontend/framegraph-components/qcameraselector_p.h
index 3f143a83d..1ef076557 100644
--- a/src/render/frontend/framegraph-components/qcameraselector_p.h
+++ b/src/render/frontend/framegraph-components/qcameraselector_p.h
@@ -49,7 +49,7 @@ class QCameraSelector;
class QCameraSelectorPrivate : public QFrameGraphNodePrivate
{
public:
- QCameraSelectorPrivate(QCameraSelector *qq);
+ QCameraSelectorPrivate();
Q_DECLARE_PUBLIC(QCameraSelector)
QEntity *m_camera;
diff --git a/src/render/frontend/framegraph-components/qclearbuffer.cpp b/src/render/frontend/framegraph-components/qclearbuffer.cpp
index f1e6ddb85..e6fc20a84 100644
--- a/src/render/frontend/framegraph-components/qclearbuffer.cpp
+++ b/src/render/frontend/framegraph-components/qclearbuffer.cpp
@@ -46,8 +46,8 @@ namespace Qt3D {
\class Qt3D::QClearBufferPrivate
\internal
*/
-QClearBufferPrivate::QClearBufferPrivate(QClearBuffer *qq)
- : QFrameGraphNodePrivate(qq)
+QClearBufferPrivate::QClearBufferPrivate()
+ : QFrameGraphNodePrivate()
, m_buffersType(QClearBuffer::None)
{
}
@@ -60,7 +60,7 @@ void QClearBuffer::copy(const QNode *ref)
}
QClearBuffer::QClearBuffer(QNode *parent)
- : QFrameGraphNode(*new QClearBufferPrivate(this), parent)
+ : QFrameGraphNode(*new QClearBufferPrivate, parent)
{
}
diff --git a/src/render/frontend/framegraph-components/qclearbuffer_p.h b/src/render/frontend/framegraph-components/qclearbuffer_p.h
index 14ad5244e..f78b89429 100644
--- a/src/render/frontend/framegraph-components/qclearbuffer_p.h
+++ b/src/render/frontend/framegraph-components/qclearbuffer_p.h
@@ -47,7 +47,7 @@ namespace Qt3D {
class QClearBufferPrivate : public QFrameGraphNodePrivate
{
public:
- QClearBufferPrivate(QClearBuffer *qq);
+ QClearBufferPrivate();
Q_DECLARE_PUBLIC(QClearBuffer)
QClearBuffer::BufferType m_buffersType;
diff --git a/src/render/frontend/framegraph-components/qframegraph.cpp b/src/render/frontend/framegraph-components/qframegraph.cpp
index 4d269c2cd..67774808e 100644
--- a/src/render/frontend/framegraph-components/qframegraph.cpp
+++ b/src/render/frontend/framegraph-components/qframegraph.cpp
@@ -48,8 +48,8 @@ namespace Qt3D {
\class Qt3D::QFrameGraphPrivate
\internal
*/
-QFrameGraphPrivate::QFrameGraphPrivate(QFrameGraph *qq)
- : QComponentPrivate(qq)
+QFrameGraphPrivate::QFrameGraphPrivate()
+ : QComponentPrivate()
, m_activeFrameGraph(Q_NULLPTR)
{
@@ -76,7 +76,7 @@ void QFrameGraph::copy(const QNode *ref)
*/
QFrameGraph::QFrameGraph(QNode *parent)
- : QComponent(*new QFrameGraphPrivate(this), parent)
+ : QComponent(*new QFrameGraphPrivate, parent)
{
}
diff --git a/src/render/frontend/framegraph-components/qframegraph_p.h b/src/render/frontend/framegraph-components/qframegraph_p.h
index fd1d056b8..c4963a4ea 100644
--- a/src/render/frontend/framegraph-components/qframegraph_p.h
+++ b/src/render/frontend/framegraph-components/qframegraph_p.h
@@ -50,7 +50,7 @@ class QFrameGraphNode;
class QFrameGraphPrivate : public QComponentPrivate
{
public:
- QFrameGraphPrivate(QFrameGraph *qq);
+ QFrameGraphPrivate();
Q_DECLARE_PUBLIC(QFrameGraph)
diff --git a/src/render/frontend/framegraph-components/qframegraphnode.cpp b/src/render/frontend/framegraph-components/qframegraphnode.cpp
index fadf049b8..edf4c127e 100644
--- a/src/render/frontend/framegraph-components/qframegraphnode.cpp
+++ b/src/render/frontend/framegraph-components/qframegraphnode.cpp
@@ -56,14 +56,14 @@ namespace Qt3D {
\class Qt3D::QFrameGraphNodePrivate
\internal
*/
-QFrameGraphNodePrivate::QFrameGraphNodePrivate(QFrameGraphNode *qq)
- : QNodePrivate(qq)
+QFrameGraphNodePrivate::QFrameGraphNodePrivate()
+ : QNodePrivate()
, m_enabled(true)
{
}
QFrameGraphNode::QFrameGraphNode(QNode *parent)
- : QNode(*new QFrameGraphNodePrivate(this), parent)
+ : QNode(*new QFrameGraphNodePrivate, parent)
{
}
diff --git a/src/render/frontend/framegraph-components/qframegraphnode_p.h b/src/render/frontend/framegraph-components/qframegraphnode_p.h
index ecf4f6b78..02cfc5be1 100644
--- a/src/render/frontend/framegraph-components/qframegraphnode_p.h
+++ b/src/render/frontend/framegraph-components/qframegraphnode_p.h
@@ -50,7 +50,7 @@ class QFrameGraphNode;
class QFrameGraphNodePrivate : public QNodePrivate
{
public:
- QFrameGraphNodePrivate(QFrameGraphNode *qq);
+ QFrameGraphNodePrivate();
Q_DECLARE_PUBLIC(QFrameGraphNode)
bool m_enabled;
diff --git a/src/render/frontend/framegraph-components/qframegraphselector.cpp b/src/render/frontend/framegraph-components/qframegraphselector.cpp
index 75e30decd..20fba808c 100644
--- a/src/render/frontend/framegraph-components/qframegraphselector.cpp
+++ b/src/render/frontend/framegraph-components/qframegraphselector.cpp
@@ -45,8 +45,8 @@ namespace Qt3D {
\class Qt3D::QFrameGraphSelectorPrivate
\internal
*/
-QFrameGraphSelectorPrivate::QFrameGraphSelectorPrivate(QFrameGraphSelector *qq)
- : QFrameGraphNodePrivate(qq)
+QFrameGraphSelectorPrivate::QFrameGraphSelectorPrivate()
+ : QFrameGraphNodePrivate()
{
}
@@ -65,7 +65,7 @@ QFrameGraphSelectorPrivate::QFrameGraphSelectorPrivate(QFrameGraphSelector *qq)
Constructs a new Qt3D::QFrameGraphSelector instance using \a parent as parent.
*/
QFrameGraphSelector::QFrameGraphSelector(QNode *parent)
- : QFrameGraphNode(*new QFrameGraphSelectorPrivate(this), parent)
+ : QFrameGraphNode(*new QFrameGraphSelectorPrivate, parent)
{
}
diff --git a/src/render/frontend/framegraph-components/qframegraphselector_p.h b/src/render/frontend/framegraph-components/qframegraphselector_p.h
index e1a6857bc..28228dcdb 100644
--- a/src/render/frontend/framegraph-components/qframegraphselector_p.h
+++ b/src/render/frontend/framegraph-components/qframegraphselector_p.h
@@ -50,7 +50,7 @@ typedef QSharedPointer<QFrameGraphSelectorFunctor> QFrameGraphSelectorFunctorPtr
class QFrameGraphSelectorPrivate : public QFrameGraphNodePrivate
{
public:
- QFrameGraphSelectorPrivate(QFrameGraphSelector *qq);
+ QFrameGraphSelectorPrivate();
QFrameGraphSelectorFunctorPtr m_selectionFunctor;
diff --git a/src/render/frontend/framegraph-components/qlayerfilter.cpp b/src/render/frontend/framegraph-components/qlayerfilter.cpp
index a883769bc..4039ac2f7 100644
--- a/src/render/frontend/framegraph-components/qlayerfilter.cpp
+++ b/src/render/frontend/framegraph-components/qlayerfilter.cpp
@@ -46,8 +46,8 @@ namespace Qt3D {
\class Qt3D::QLayerFilterPrivate
\internal
*/
-QLayerFilterPrivate::QLayerFilterPrivate(QLayerFilter *qq)
- : QFrameGraphNodePrivate(qq)
+QLayerFilterPrivate::QLayerFilterPrivate()
+ : QFrameGraphNodePrivate()
{
}
@@ -59,7 +59,7 @@ void QLayerFilter::copy(const QNode *ref)
}
QLayerFilter::QLayerFilter(QNode *parent)
- : QFrameGraphNode(*new QLayerFilterPrivate(this), parent)
+ : QFrameGraphNode(*new QLayerFilterPrivate, parent)
{
}
diff --git a/src/render/frontend/framegraph-components/qlayerfilter_p.h b/src/render/frontend/framegraph-components/qlayerfilter_p.h
index 6fd69bfa3..d998652e4 100644
--- a/src/render/frontend/framegraph-components/qlayerfilter_p.h
+++ b/src/render/frontend/framegraph-components/qlayerfilter_p.h
@@ -49,7 +49,7 @@ class QLayerFilter;
class QT3DRENDERERSHARED_EXPORT QLayerFilterPrivate : public QFrameGraphNodePrivate
{
public:
- explicit QLayerFilterPrivate(QLayerFilter *qq);
+ QLayerFilterPrivate();
Q_DECLARE_PUBLIC(QLayerFilter)
QStringList m_layers;
diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
index af5c28a3e..85fddc7b6 100644
--- a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
+++ b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp
@@ -51,7 +51,7 @@ namespace Qt3D {
*/
QRenderPassFilter::QRenderPassFilter(QNode *parent)
- : QFrameGraphNode(*new QRenderPassFilterPrivate(this), parent)
+ : QFrameGraphNode(*new QRenderPassFilterPrivate, parent)
{}
/*! \internal */
diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter_p.h b/src/render/frontend/framegraph-components/qrenderpassfilter_p.h
index a843091f6..a849bf0c2 100644
--- a/src/render/frontend/framegraph-components/qrenderpassfilter_p.h
+++ b/src/render/frontend/framegraph-components/qrenderpassfilter_p.h
@@ -48,8 +48,8 @@ class QRenderPassFilter;
class QRenderPassFilterPrivate : public QFrameGraphNodePrivate
{
public:
- QRenderPassFilterPrivate(QRenderPassFilter *qq)
- : QFrameGraphNodePrivate(qq)
+ QRenderPassFilterPrivate()
+ : QFrameGraphNodePrivate()
{}
Q_DECLARE_PUBLIC(QRenderPassFilter)
diff --git a/src/render/frontend/framegraph-components/qrendertargetselector.cpp b/src/render/frontend/framegraph-components/qrendertargetselector.cpp
index b357f713b..fd5a58640 100644
--- a/src/render/frontend/framegraph-components/qrendertargetselector.cpp
+++ b/src/render/frontend/framegraph-components/qrendertargetselector.cpp
@@ -48,8 +48,8 @@ namespace Qt3D {
\class Qt3D::QRenderTargetSelectorPrivate
\internal
*/
-QRenderTargetSelectorPrivate::QRenderTargetSelectorPrivate(QRenderTargetSelector *qq)
- : QFrameGraphNodePrivate(qq)
+QRenderTargetSelectorPrivate::QRenderTargetSelectorPrivate()
+ : QFrameGraphNodePrivate()
, m_target(Q_NULLPTR)
{
}
@@ -65,7 +65,7 @@ void QRenderTargetSelector::copy(const QNode *ref)
}
QRenderTargetSelector::QRenderTargetSelector(QNode *parent)
- : QFrameGraphNode(*new QRenderTargetSelectorPrivate(this), parent)
+ : QFrameGraphNode(*new QRenderTargetSelectorPrivate, parent)
{
}
diff --git a/src/render/frontend/framegraph-components/qrendertargetselector_p.h b/src/render/frontend/framegraph-components/qrendertargetselector_p.h
index 8c41de798..10a27ee3a 100644
--- a/src/render/frontend/framegraph-components/qrendertargetselector_p.h
+++ b/src/render/frontend/framegraph-components/qrendertargetselector_p.h
@@ -49,7 +49,7 @@ class QRenderTarget;
class QRenderTargetSelectorPrivate : public QFrameGraphNodePrivate
{
public:
- QRenderTargetSelectorPrivate(QRenderTargetSelector *qq);
+ QRenderTargetSelectorPrivate();
Q_DECLARE_PUBLIC(QRenderTargetSelector)
QRenderTarget *m_target;
diff --git a/src/render/frontend/framegraph-components/qsortcriterion.cpp b/src/render/frontend/framegraph-components/qsortcriterion.cpp
index 631a9e595..85b5cd9fa 100644
--- a/src/render/frontend/framegraph-components/qsortcriterion.cpp
+++ b/src/render/frontend/framegraph-components/qsortcriterion.cpp
@@ -46,8 +46,8 @@ namespace Qt3D {
\class Qt3D::QSortCriterionPrivate
\internal
*/
-QSortCriterionPrivate::QSortCriterionPrivate(QSortCriterion *qq)
- : QNodePrivate(qq)
+QSortCriterionPrivate::QSortCriterionPrivate()
+ : QNodePrivate()
, m_sort(QSortCriterion::StateChangeCost)
{
}
@@ -60,7 +60,7 @@ void QSortCriterion::copy(const QNode *ref)
}
QSortCriterion::QSortCriterion(QNode *parent)
- : QNode(*new QSortCriterionPrivate(this), parent)
+ : QNode(*new QSortCriterionPrivate, parent)
{
}
diff --git a/src/render/frontend/framegraph-components/qsortcriterion_p.h b/src/render/frontend/framegraph-components/qsortcriterion_p.h
index 7e9d963ec..7e75c9a59 100644
--- a/src/render/frontend/framegraph-components/qsortcriterion_p.h
+++ b/src/render/frontend/framegraph-components/qsortcriterion_p.h
@@ -47,7 +47,7 @@ namespace Qt3D {
class QSortCriterionPrivate : public QNodePrivate
{
public:
- QSortCriterionPrivate(QSortCriterion *qq);
+ QSortCriterionPrivate();
Q_DECLARE_PUBLIC(QSortCriterion)
QSortCriterion::SortType m_sort;
diff --git a/src/render/frontend/framegraph-components/qsortmethod.cpp b/src/render/frontend/framegraph-components/qsortmethod.cpp
index f778e33a3..4f70dd7cd 100644
--- a/src/render/frontend/framegraph-components/qsortmethod.cpp
+++ b/src/render/frontend/framegraph-components/qsortmethod.cpp
@@ -48,8 +48,8 @@ namespace Qt3D {
\class Qt3D::QSortMethodPrivate
\internal
*/
-QSortMethodPrivate::QSortMethodPrivate(QSortMethod *qq)
- : QFrameGraphNodePrivate(qq)
+QSortMethodPrivate::QSortMethodPrivate()
+ : QFrameGraphNodePrivate()
{
}
@@ -62,7 +62,7 @@ void QSortMethod::copy(const QNode *ref)
}
QSortMethod::QSortMethod(QNode *parent)
- : QFrameGraphNode(*new QSortMethodPrivate(this), parent)
+ : QFrameGraphNode(*new QSortMethodPrivate, parent)
{
}
diff --git a/src/render/frontend/framegraph-components/qsortmethod_p.h b/src/render/frontend/framegraph-components/qsortmethod_p.h
index 3fc6e55d6..4ee604463 100644
--- a/src/render/frontend/framegraph-components/qsortmethod_p.h
+++ b/src/render/frontend/framegraph-components/qsortmethod_p.h
@@ -49,7 +49,7 @@ class QSortCriterion;
class QSortMethodPrivate : public QFrameGraphNodePrivate
{
public:
- QSortMethodPrivate(QSortMethod *qq);
+ QSortMethodPrivate();
Q_DECLARE_PUBLIC(QSortMethod)
QList<QSortCriterion *> m_criteria;
};
diff --git a/src/render/frontend/framegraph-components/qstateset.cpp b/src/render/frontend/framegraph-components/qstateset.cpp
index 11e8d54bc..6f5149b87 100644
--- a/src/render/frontend/framegraph-components/qstateset.cpp
+++ b/src/render/frontend/framegraph-components/qstateset.cpp
@@ -44,8 +44,8 @@ QT_BEGIN_NAMESPACE
namespace Qt3D {
-QStateSetPrivate::QStateSetPrivate(QStateSet *qq)
- : QFrameGraphNodePrivate(qq)
+QStateSetPrivate::QStateSetPrivate()
+ : QFrameGraphNodePrivate()
{
}
@@ -68,7 +68,7 @@ QStateSetPrivate::QStateSetPrivate(QStateSet *qq)
*/
QStateSet::QStateSet(QNode *parent)
- : QFrameGraphNode(*new QStateSetPrivate(this), parent)
+ : QFrameGraphNode(*new QStateSetPrivate, parent)
{
}
diff --git a/src/render/frontend/framegraph-components/qstateset_p.h b/src/render/frontend/framegraph-components/qstateset_p.h
index afb610fc6..290578bec 100644
--- a/src/render/frontend/framegraph-components/qstateset_p.h
+++ b/src/render/frontend/framegraph-components/qstateset_p.h
@@ -49,7 +49,7 @@ class QRenderState;
class QStateSetPrivate : public QFrameGraphNodePrivate
{
public:
- QStateSetPrivate(QStateSet *qq);
+ QStateSetPrivate();
Q_DECLARE_PUBLIC(QStateSet)
QList<QRenderState *> m_renderStates;
diff --git a/src/render/frontend/framegraph-components/qtechniquefilter.cpp b/src/render/frontend/framegraph-components/qtechniquefilter.cpp
index d0801a535..7d93b40be 100644
--- a/src/render/frontend/framegraph-components/qtechniquefilter.cpp
+++ b/src/render/frontend/framegraph-components/qtechniquefilter.cpp
@@ -49,8 +49,8 @@ namespace Qt3D {
\class Qt3D::QTechniqueFilterPrivate
\internal
*/
-QTechniqueFilterPrivate::QTechniqueFilterPrivate(QTechniqueFilter *qq)
- : QFrameGraphNodePrivate(qq)
+QTechniqueFilterPrivate::QTechniqueFilterPrivate()
+ : QFrameGraphNodePrivate()
{
}
@@ -64,7 +64,7 @@ void QTechniqueFilter::copy(const QNode *ref)
}
QTechniqueFilter::QTechniqueFilter(QNode *parent)
- : QFrameGraphNode(*new QTechniqueFilterPrivate(this), parent)
+ : QFrameGraphNode(*new QTechniqueFilterPrivate, parent)
{
}
diff --git a/src/render/frontend/framegraph-components/qtechniquefilter_p.h b/src/render/frontend/framegraph-components/qtechniquefilter_p.h
index eb522c6cc..1b87f4e12 100644
--- a/src/render/frontend/framegraph-components/qtechniquefilter_p.h
+++ b/src/render/frontend/framegraph-components/qtechniquefilter_p.h
@@ -48,7 +48,7 @@ class QTechniqueFilter;
class QTechniqueFilterPrivate : public QFrameGraphNodePrivate
{
public :
- QTechniqueFilterPrivate(QTechniqueFilter *qq);
+ QTechniqueFilterPrivate();
Q_DECLARE_PUBLIC(QTechniqueFilter)
QList<QAnnotation *> m_requireList;
diff --git a/src/render/frontend/framegraph-components/qviewport.cpp b/src/render/frontend/framegraph-components/qviewport.cpp
index 39ad53e6b..49ae81231 100644
--- a/src/render/frontend/framegraph-components/qviewport.cpp
+++ b/src/render/frontend/framegraph-components/qviewport.cpp
@@ -47,8 +47,8 @@ namespace Qt3D {
\class Qt3D::QViewportPrivate
\internal
*/
-QViewportPrivate::QViewportPrivate(QViewport *qq)
- : QFrameGraphNodePrivate(qq)
+QViewportPrivate::QViewportPrivate()
+ : QFrameGraphNodePrivate()
, m_rect(QRectF(0.0f, 0.0f, 1.0f, 1.0f))
{
}
@@ -61,7 +61,7 @@ void QViewport::copy(const QNode *ref)
}
QViewport::QViewport(QNode *parent)
- : QFrameGraphNode(*new QViewportPrivate(this), parent)
+ : QFrameGraphNode(*new QViewportPrivate, parent)
{
}
diff --git a/src/render/frontend/framegraph-components/qviewport_p.h b/src/render/frontend/framegraph-components/qviewport_p.h
index 7b4a599e8..4e42887d7 100644
--- a/src/render/frontend/framegraph-components/qviewport_p.h
+++ b/src/render/frontend/framegraph-components/qviewport_p.h
@@ -48,7 +48,7 @@ class QViewport;
class QViewportPrivate : public QFrameGraphNodePrivate
{
public :
- QViewportPrivate(QViewport *qq);
+ QViewportPrivate();
Q_DECLARE_PUBLIC(QViewport)
QRectF m_rect;
diff --git a/src/render/frontend/qabstractlight.cpp b/src/render/frontend/qabstractlight.cpp
index 1a0865536..4bb7fb0c0 100644
--- a/src/render/frontend/qabstractlight.cpp
+++ b/src/render/frontend/qabstractlight.cpp
@@ -54,8 +54,8 @@ namespace Qt3D
\class Qt3D::QAbstractLightPrivate
\internal
*/
-QAbstractLightPrivate::QAbstractLightPrivate(QAbstractLight *qq)
- : QShaderDataPrivate(qq)
+QAbstractLightPrivate::QAbstractLightPrivate()
+ : QShaderDataPrivate()
, m_color(QColor(255, 255, 255))
, m_intensity(1.0f)
{}
@@ -78,7 +78,7 @@ void QAbstractLight::copy(const QNode *ref)
* Constructs a new QAbstractLight with the given \a parent.
*/
QAbstractLight::QAbstractLight(Qt3D::QNode *parent) :
- QShaderData(*new QAbstractLightPrivate(this), parent)
+ QShaderData(*new QAbstractLightPrivate, parent)
{
}
diff --git a/src/render/frontend/qabstractlight_p.h b/src/render/frontend/qabstractlight_p.h
index ee8d68236..1d90a398a 100644
--- a/src/render/frontend/qabstractlight_p.h
+++ b/src/render/frontend/qabstractlight_p.h
@@ -49,7 +49,7 @@ class QAbstractLight;
class QT3DRENDERERSHARED_EXPORT QAbstractLightPrivate : public QShaderDataPrivate
{
public:
- QAbstractLightPrivate(QAbstractLight *qq);
+ QAbstractLightPrivate();
Q_DECLARE_PUBLIC(QAbstractLight)
QColor m_color;
diff --git a/src/render/frontend/qabstractmesh.cpp b/src/render/frontend/qabstractmesh.cpp
index 6a12ac66d..a4d6a163e 100644
--- a/src/render/frontend/qabstractmesh.cpp
+++ b/src/render/frontend/qabstractmesh.cpp
@@ -58,8 +58,8 @@ namespace Qt3D {
\class Qt3D::QAbstractMeshPrivate
\internal
*/
-QAbstractMeshPrivate::QAbstractMeshPrivate(QAbstractMesh *qq)
- : QComponentPrivate(qq)
+QAbstractMeshPrivate::QAbstractMeshPrivate()
+ : QComponentPrivate()
{
}
@@ -72,7 +72,7 @@ void QAbstractMesh::copy(const QNode *ref)
QAbstractMesh::QAbstractMesh(QNode *parent)
- : QComponent(*new QAbstractMeshPrivate(this), parent)
+ : QComponent(*new QAbstractMeshPrivate, parent)
{
}
diff --git a/src/render/frontend/qabstractmesh_p.h b/src/render/frontend/qabstractmesh_p.h
index 25a25b3cc..e960b95cb 100644
--- a/src/render/frontend/qabstractmesh_p.h
+++ b/src/render/frontend/qabstractmesh_p.h
@@ -53,7 +53,7 @@ class QAbstractMesh;
class QT3DRENDERERSHARED_EXPORT QAbstractMeshPrivate : public QComponentPrivate
{
public:
- QAbstractMeshPrivate(QAbstractMesh *qq);
+ QAbstractMeshPrivate();
Q_DECLARE_PUBLIC(QAbstractMesh)
diff --git a/src/render/frontend/qabstractsceneloader.cpp b/src/render/frontend/qabstractsceneloader.cpp
index 916d4c801..f919a489e 100644
--- a/src/render/frontend/qabstractsceneloader.cpp
+++ b/src/render/frontend/qabstractsceneloader.cpp
@@ -51,8 +51,8 @@ namespace Render {
\class Qt3D::Render::QAbstractSceneLoaderPrivate
\internal
*/
-QAbstractSceneLoaderPrivate::QAbstractSceneLoaderPrivate(QAbstractSceneLoader *qq)
- : QComponentPrivate(qq)
+QAbstractSceneLoaderPrivate::QAbstractSceneLoaderPrivate()
+ : QComponentPrivate()
, m_status(QAbstractSceneLoader::Loading)
{
m_shareable = false;
@@ -65,7 +65,7 @@ QAbstractSceneLoader::QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, QNod
}
QAbstractSceneLoader::QAbstractSceneLoader(QNode *parent)
- : QComponent(*new QAbstractSceneLoaderPrivate(this), parent)
+ : QComponent(*new QAbstractSceneLoaderPrivate, parent)
{
}
diff --git a/src/render/frontend/qabstractsceneloader_p.h b/src/render/frontend/qabstractsceneloader_p.h
index b9586fcf7..c76f5d854 100644
--- a/src/render/frontend/qabstractsceneloader_p.h
+++ b/src/render/frontend/qabstractsceneloader_p.h
@@ -53,7 +53,7 @@ namespace Render {
class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoaderPrivate : public QComponentPrivate
{
public:
- QAbstractSceneLoaderPrivate(QAbstractSceneLoader *qq);
+ QAbstractSceneLoaderPrivate();
Q_DECLARE_PUBLIC(QAbstractSceneLoader)
diff --git a/src/render/frontend/qabstracttextureimage.cpp b/src/render/frontend/qabstracttextureimage.cpp
index df2adbf21..5f5d04c6f 100644
--- a/src/render/frontend/qabstracttextureimage.cpp
+++ b/src/render/frontend/qabstracttextureimage.cpp
@@ -69,7 +69,7 @@ namespace Qt3D {
Constructs a new Qt3D::QAbstractTextureImage instance with \a parent as parent.
*/
QAbstractTextureImage::QAbstractTextureImage(QNode *parent)
- : QNode(*new QAbstractTextureImagePrivate(this), parent)
+ : QNode(*new QAbstractTextureImagePrivate, parent)
{
}
diff --git a/src/render/frontend/qabstracttextureimage_p.h b/src/render/frontend/qabstracttextureimage_p.h
index 95e55788b..fd795f18a 100644
--- a/src/render/frontend/qabstracttextureimage_p.h
+++ b/src/render/frontend/qabstracttextureimage_p.h
@@ -50,8 +50,8 @@ class QAbstractTextureImage;
class QT3DRENDERERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public QNodePrivate
{
public:
- QAbstractTextureImagePrivate(QAbstractTextureImage *qq)
- : QNodePrivate(qq)
+ QAbstractTextureImagePrivate()
+ : QNodePrivate()
, m_mipmapLevel(0)
, m_layer(0)
, m_face(QAbstractTextureProvider::CubeMapPositiveX)
diff --git a/src/render/frontend/qabstracttextureprovider.cpp b/src/render/frontend/qabstracttextureprovider.cpp
index cafe2861c..75ea92f03 100644
--- a/src/render/frontend/qabstracttextureprovider.cpp
+++ b/src/render/frontend/qabstracttextureprovider.cpp
@@ -47,8 +47,8 @@ namespace Qt3D {
\class Qt3D::QAbstractTextureProviderPrivate
\internal
*/
-QAbstractTextureProviderPrivate::QAbstractTextureProviderPrivate(QAbstractTextureProvider *qq)
- : QNodePrivate(qq)
+QAbstractTextureProviderPrivate::QAbstractTextureProviderPrivate()
+ : QNodePrivate()
, m_target(QAbstractTextureProvider::Target2D)
, m_format(QAbstractTextureProvider::Automatic)
, m_width(1)
@@ -102,12 +102,12 @@ void QAbstractTextureProvider::copy(const QNode *ref)
QAbstractTextureProvider::QAbstractTextureProvider(QNode *parent)
- : QNode(*new QAbstractTextureProviderPrivate(this), parent)
+ : QNode(*new QAbstractTextureProviderPrivate, parent)
{
}
QAbstractTextureProvider::QAbstractTextureProvider(Target target, QNode *parent)
- : QNode(*new QAbstractTextureProviderPrivate(this), parent)
+ : QNode(*new QAbstractTextureProviderPrivate, parent)
{
d_func()->m_target = target;
}
diff --git a/src/render/frontend/qabstracttextureprovider_p.h b/src/render/frontend/qabstracttextureprovider_p.h
index c3fafb402..b9f216e5c 100644
--- a/src/render/frontend/qabstracttextureprovider_p.h
+++ b/src/render/frontend/qabstracttextureprovider_p.h
@@ -49,7 +49,7 @@ namespace Qt3D {
class QAbstractTextureProviderPrivate : public QNodePrivate
{
public :
- QAbstractTextureProviderPrivate(QAbstractTextureProvider *qq);
+ QAbstractTextureProviderPrivate();
Q_DECLARE_PUBLIC(QAbstractTextureProvider)
diff --git a/src/render/frontend/qalphacoverage.cpp b/src/render/frontend/qalphacoverage.cpp
index 7cc9afaed..c96980d90 100644
--- a/src/render/frontend/qalphacoverage.cpp
+++ b/src/render/frontend/qalphacoverage.cpp
@@ -45,15 +45,15 @@ namespace Qt3D {
class QAlphaCoveragePrivate : public QRenderStatePrivate
{
public :
- QAlphaCoveragePrivate(QAlphaCoverage *qq)
- : QRenderStatePrivate(qq, QRenderState::AlphaCoverage)
+ QAlphaCoveragePrivate()
+ : QRenderStatePrivate(QRenderState::AlphaCoverage)
{}
Q_DECLARE_PUBLIC(QAlphaCoverage)
};
QAlphaCoverage::QAlphaCoverage(QNode *parent)
- : QRenderState(*new QAlphaCoveragePrivate(this), parent)
+ : QRenderState(*new QAlphaCoveragePrivate, parent)
{
}
diff --git a/src/render/frontend/qalphatest.cpp b/src/render/frontend/qalphatest.cpp
index c011d42fc..1b0498392 100644
--- a/src/render/frontend/qalphatest.cpp
+++ b/src/render/frontend/qalphatest.cpp
@@ -47,8 +47,8 @@ namespace Qt3D {
class QAlphaTestPrivate : public QRenderStatePrivate
{
public:
- QAlphaTestPrivate(QAlphaTest *qq)
- : QRenderStatePrivate(qq, QRenderState::AlphaTest)
+ QAlphaTestPrivate()
+ : QRenderStatePrivate(QRenderState::AlphaTest)
, m_func(QAlphaTest::Never)
, m_clamp(0.0f)
{
@@ -60,7 +60,7 @@ public:
};
QAlphaTest::QAlphaTest(QNode *parent)
- : QRenderState(*new QAlphaTestPrivate(this), parent)
+ : QRenderState(*new QAlphaTestPrivate, parent)
{
}
diff --git a/src/render/frontend/qannotation.cpp b/src/render/frontend/qannotation.cpp
index 75b4d732e..fb56772f5 100644
--- a/src/render/frontend/qannotation.cpp
+++ b/src/render/frontend/qannotation.cpp
@@ -48,8 +48,8 @@ namespace Qt3D {
\class Qt3D::QAnnotationPrivate
\internal
*/
-QAnnotationPrivate::QAnnotationPrivate(QAnnotation *qq)
- : QNodePrivate(qq)
+QAnnotationPrivate::QAnnotationPrivate()
+ : QNodePrivate()
{
}
@@ -62,7 +62,7 @@ void QAnnotation::copy(const QNode *ref)
}
QAnnotation::QAnnotation(QNode *parent)
- : QNode(*new QAnnotationPrivate(this), parent)
+ : QNode(*new QAnnotationPrivate, parent)
{
}
diff --git a/src/render/frontend/qannotation_p.h b/src/render/frontend/qannotation_p.h
index f790cd155..d0bd44dc5 100644
--- a/src/render/frontend/qannotation_p.h
+++ b/src/render/frontend/qannotation_p.h
@@ -47,7 +47,7 @@ namespace Qt3D {
class QAnnotationPrivate : public QNodePrivate
{
public:
- QAnnotationPrivate(QAnnotation *qq);
+ QAnnotationPrivate();
Q_DECLARE_PUBLIC(QAnnotation)
QString m_name;
diff --git a/src/render/frontend/qblendequation.cpp b/src/render/frontend/qblendequation.cpp
index 0e8b8fac7..9960bb2b8 100644
--- a/src/render/frontend/qblendequation.cpp
+++ b/src/render/frontend/qblendequation.cpp
@@ -47,8 +47,8 @@ namespace Qt3D {
class QBlendEquationPrivate : public QRenderStatePrivate
{
public:
- QBlendEquationPrivate(QBlendEquation *qq)
- : QRenderStatePrivate(qq, QRenderState::BlendEquation)
+ QBlendEquationPrivate()
+ : QRenderStatePrivate(QRenderState::BlendEquation)
{
}
@@ -64,7 +64,7 @@ void QBlendEquation::copy(const QNode *ref)
}
QBlendEquation::QBlendEquation(QNode *parent)
- : QRenderState(*new QBlendEquationPrivate(this), parent)
+ : QRenderState(*new QBlendEquationPrivate, parent)
{
}
diff --git a/src/render/frontend/qblendstate.cpp b/src/render/frontend/qblendstate.cpp
index 055cd948e..6f401d3e9 100644
--- a/src/render/frontend/qblendstate.cpp
+++ b/src/render/frontend/qblendstate.cpp
@@ -47,8 +47,8 @@ namespace Qt3D {
class QBlendStatePrivate : public QRenderStatePrivate
{
public:
- QBlendStatePrivate(QBlendState *qq, QRenderState::Type type = QRenderState::BlendState)
- : QRenderStatePrivate(qq, type)
+ QBlendStatePrivate(QRenderState::Type type = QRenderState::BlendState)
+ : QRenderStatePrivate(type)
, m_srcRGB(QBlendState::Zero)
, m_srcAlpha(QBlendState::Zero)
, m_dstRGB(QBlendState::Zero)
@@ -65,7 +65,7 @@ public:
};
QBlendState::QBlendState(QNode *parent)
- : QRenderState(*new QBlendStatePrivate(this), parent)
+ : QRenderState(*new QBlendStatePrivate, parent)
{
}
@@ -80,7 +80,7 @@ void QBlendState::copy(const QNode *ref)
}
QBlendState::QBlendState(QRenderState::Type type, QNode *parent)
- : QRenderState(*new QBlendStatePrivate(this, type), parent)
+ : QRenderState(*new QBlendStatePrivate(type), parent)
{
}
diff --git a/src/render/frontend/qcolormask.cpp b/src/render/frontend/qcolormask.cpp
index 95e2e69b2..923f16b4d 100644
--- a/src/render/frontend/qcolormask.cpp
+++ b/src/render/frontend/qcolormask.cpp
@@ -44,8 +44,8 @@ namespace Qt3D {
class QColorMaskPrivate : public QRenderStatePrivate
{
public:
- QColorMaskPrivate(QColorMask *qq)
- : QRenderStatePrivate(qq, QRenderState::ColorMask)
+ QColorMaskPrivate()
+ : QRenderStatePrivate(QRenderState::ColorMask)
, m_red(true)
, m_green(true)
, m_blue(true)
@@ -77,7 +77,7 @@ public:
Constructs a new Qt3D::QColorMask instance with \a parent as parent.
*/
QColorMask::QColorMask(QNode *parent)
- : QRenderState(*new QColorMaskPrivate(this), parent)
+ : QRenderState(*new QColorMaskPrivate, parent)
{
}
diff --git a/src/render/frontend/qcuboidmesh.cpp b/src/render/frontend/qcuboidmesh.cpp
index 33769b1ca..26238f8b6 100644
--- a/src/render/frontend/qcuboidmesh.cpp
+++ b/src/render/frontend/qcuboidmesh.cpp
@@ -52,8 +52,8 @@ namespace Qt3D {
\class Qt3D::QCuboidMeshPrivate
\internal
*/
-QCuboidMeshPrivate::QCuboidMeshPrivate(QCuboidMesh *qq)
- : QAbstractMeshPrivate(qq)
+QCuboidMeshPrivate::QCuboidMeshPrivate()
+ : QAbstractMeshPrivate()
, m_xExtent(1.0)
, m_yExtent(1.0)
, m_zExtent(1.0)
@@ -76,7 +76,7 @@ void QCuboidMesh::copy(const QNode *ref)
}
QCuboidMesh::QCuboidMesh(QNode *parent)
- : QAbstractMesh(*new QCuboidMeshPrivate(this), parent)
+ : QAbstractMesh(*new QCuboidMeshPrivate, parent)
{
update();
}
diff --git a/src/render/frontend/qcuboidmesh_p.h b/src/render/frontend/qcuboidmesh_p.h
index c809189ce..f28e320ab 100644
--- a/src/render/frontend/qcuboidmesh_p.h
+++ b/src/render/frontend/qcuboidmesh_p.h
@@ -50,7 +50,7 @@ class QCuboidMesh;
class QCuboidMeshPrivate : QAbstractMeshPrivate
{
public:
- QCuboidMeshPrivate(QCuboidMesh *qq);
+ QCuboidMeshPrivate();
Q_DECLARE_PUBLIC(QCuboidMesh)
diff --git a/src/render/frontend/qcullface.cpp b/src/render/frontend/qcullface.cpp
index 6dd243762..cf2303ee6 100644
--- a/src/render/frontend/qcullface.cpp
+++ b/src/render/frontend/qcullface.cpp
@@ -47,8 +47,8 @@ namespace Qt3D {
class QCullFacePrivate : public QRenderStatePrivate
{
public:
- QCullFacePrivate(QCullFace *qq)
- : QRenderStatePrivate(qq, QRenderState::CullFace)
+ QCullFacePrivate()
+ : QRenderStatePrivate(QRenderState::CullFace)
, m_mode(QCullFace::Back)
{
}
@@ -58,7 +58,7 @@ public:
};
QCullFace::QCullFace(QNode *parent)
- : QRenderState(*new QCullFacePrivate(this), parent)
+ : QRenderState(*new QCullFacePrivate, parent)
{
}
diff --git a/src/render/frontend/qcylindermesh.cpp b/src/render/frontend/qcylindermesh.cpp
index 5c93a8234..f7fe495c9 100644
--- a/src/render/frontend/qcylindermesh.cpp
+++ b/src/render/frontend/qcylindermesh.cpp
@@ -68,8 +68,8 @@ private:
class QCylinderMeshPrivate : public QAbstractMeshPrivate
{
- QCylinderMeshPrivate(QCylinderMesh *qq)
- : QAbstractMeshPrivate(qq)
+ QCylinderMeshPrivate()
+ : QAbstractMeshPrivate()
, m_rings(16)
, m_slices(16)
, m_radius(1.0)
@@ -94,7 +94,7 @@ void QCylinderMesh::copy(const QNode *ref)
}
QCylinderMesh::QCylinderMesh(QNode *parent)
- : QAbstractMesh(*new QCylinderMeshPrivate(this), parent)
+ : QAbstractMesh(*new QCylinderMeshPrivate, parent)
{
update();
}
diff --git a/src/render/frontend/qdepthmask.cpp b/src/render/frontend/qdepthmask.cpp
index 81aaffd68..d3cb3d047 100644
--- a/src/render/frontend/qdepthmask.cpp
+++ b/src/render/frontend/qdepthmask.cpp
@@ -47,8 +47,8 @@ namespace Qt3D {
class QDepthMaskPrivate : public QRenderStatePrivate
{
public:
- QDepthMaskPrivate(QDepthMask *qq)
- : QRenderStatePrivate(qq, QRenderState::DepthMask)
+ QDepthMaskPrivate()
+ : QRenderStatePrivate(QRenderState::DepthMask)
, m_mask(false)
{
}
@@ -58,7 +58,7 @@ public:
};
QDepthMask::QDepthMask(QNode *parent)
- : QRenderState(*new QDepthMaskPrivate(this), parent)
+ : QRenderState(*new QDepthMaskPrivate, parent)
{
}
diff --git a/src/render/frontend/qdepthtest.cpp b/src/render/frontend/qdepthtest.cpp
index e7ba1c91e..331a5be8d 100644
--- a/src/render/frontend/qdepthtest.cpp
+++ b/src/render/frontend/qdepthtest.cpp
@@ -49,8 +49,8 @@ class QDepthTest;
class QDepthTestPrivate : public QRenderStatePrivate
{
public :
- QDepthTestPrivate(QDepthTest *qq)
- : QRenderStatePrivate(qq, QRenderState::DepthTest)
+ QDepthTestPrivate()
+ : QRenderStatePrivate(QRenderState::DepthTest)
, m_func(QDepthTest::Never)
{
}
@@ -67,7 +67,7 @@ void QDepthTest::copy(const QNode *ref)
}
QDepthTest::QDepthTest(QNode *parent)
- : QRenderState(*new QDepthTestPrivate(this), parent)
+ : QRenderState(*new QDepthTestPrivate, parent)
{
}
diff --git a/src/render/frontend/qdirectionallight.cpp b/src/render/frontend/qdirectionallight.cpp
index 4cfc72a50..515ddfae0 100644
--- a/src/render/frontend/qdirectionallight.cpp
+++ b/src/render/frontend/qdirectionallight.cpp
@@ -65,8 +65,8 @@ namespace Qt3D {
\class Qt3D::QDirectionalLightPrivate
\internal
*/
-QDirectionalLightPrivate::QDirectionalLightPrivate(QDirectionalLight *qq)
- : QAbstractLightPrivate(qq)
+QDirectionalLightPrivate::QDirectionalLightPrivate()
+ : QAbstractLightPrivate()
{
}
@@ -80,7 +80,7 @@ void QDirectionalLight::copy(const QNode *ref)
}
QDirectionalLight::QDirectionalLight(QNode *parent)
- : QAbstractLight(*new QDirectionalLightPrivate(this), parent)
+ : QAbstractLight(*new QDirectionalLightPrivate, parent)
{
}
diff --git a/src/render/frontend/qdirectionallight_p.h b/src/render/frontend/qdirectionallight_p.h
index eecd1e078..bfe24211c 100644
--- a/src/render/frontend/qdirectionallight_p.h
+++ b/src/render/frontend/qdirectionallight_p.h
@@ -48,7 +48,7 @@ class QDirectionalLight;
class QT3DRENDERERSHARED_EXPORT QDirectionalLightPrivate : QAbstractLightPrivate
{
public:
- QDirectionalLightPrivate(QDirectionalLight *qq);
+ QDirectionalLightPrivate();
Q_DECLARE_PUBLIC(QDirectionalLight)
QVector3D m_direction;
diff --git a/src/render/frontend/qdithering.cpp b/src/render/frontend/qdithering.cpp
index 7b45db087..6d8bb5fdf 100644
--- a/src/render/frontend/qdithering.cpp
+++ b/src/render/frontend/qdithering.cpp
@@ -47,15 +47,15 @@ namespace Qt3D {
class QDitheringPrivate : public QRenderStatePrivate
{
public:
- QDitheringPrivate(QDithering *qq)
- : QRenderStatePrivate(qq, QRenderState::Dithering)
+ QDitheringPrivate()
+ : QRenderStatePrivate(QRenderState::Dithering)
{}
Q_DECLARE_PUBLIC(QDithering)
};
QDithering::QDithering(QNode *parent)
- : QRenderState(*new QDitheringPrivate(this), parent)
+ : QRenderState(*new QDitheringPrivate, parent)
{
}
diff --git a/src/render/frontend/qeffect.cpp b/src/render/frontend/qeffect.cpp
index 03e86282e..70590ec58 100644
--- a/src/render/frontend/qeffect.cpp
+++ b/src/render/frontend/qeffect.cpp
@@ -49,12 +49,13 @@ namespace Qt3D {
\class Qt3D::QEffectPrivate
\internal
*/
-QEffectPrivate::QEffectPrivate(QEffect *qq)
- : QNodePrivate(qq)
-{}
+QEffectPrivate::QEffectPrivate()
+ : QNodePrivate()
+{
+}
QEffect::QEffect(QNode *parent)
- : QNode(*new QEffectPrivate(this), parent)
+ : QNode(*new QEffectPrivate, parent)
{
}
diff --git a/src/render/frontend/qeffect_p.h b/src/render/frontend/qeffect_p.h
index fd4c7978a..53485c6cd 100644
--- a/src/render/frontend/qeffect_p.h
+++ b/src/render/frontend/qeffect_p.h
@@ -51,7 +51,7 @@ class QTechnique;
class QT3DRENDERERSHARED_EXPORT QEffectPrivate : public QNodePrivate
{
public :
- QEffectPrivate(QEffect *qq);
+ QEffectPrivate();
Q_DECLARE_PUBLIC(QEffect)
QList<QParameter *> m_parameters;
diff --git a/src/render/frontend/qfrontface.cpp b/src/render/frontend/qfrontface.cpp
index a136748f2..add4f2bab 100644
--- a/src/render/frontend/qfrontface.cpp
+++ b/src/render/frontend/qfrontface.cpp
@@ -47,8 +47,8 @@ namespace Qt3D {
class QFrontFacePrivate : public QRenderStatePrivate
{
public:
- QFrontFacePrivate(QFrontFace *qq)
- : QRenderStatePrivate(qq, QRenderState::FrontFace)
+ QFrontFacePrivate()
+ : QRenderStatePrivate(QRenderState::FrontFace)
, m_direction(QFrontFace::ClockWise)
{
}
@@ -58,7 +58,7 @@ public:
};
QFrontFace::QFrontFace(QNode *parent)
- : QRenderState(*new QFrontFacePrivate(this), parent)
+ : QRenderState(*new QFrontFacePrivate, parent)
{
}
diff --git a/src/render/frontend/qlayer.cpp b/src/render/frontend/qlayer.cpp
index 4f96a8fe8..f9e43d2be 100644
--- a/src/render/frontend/qlayer.cpp
+++ b/src/render/frontend/qlayer.cpp
@@ -45,8 +45,8 @@ namespace Qt3D {
\class Qt3D::QLayerPrivate
\internal
*/
-QLayerPrivate::QLayerPrivate(QLayer *qq)
- : QComponentPrivate(qq)
+QLayerPrivate::QLayerPrivate()
+ : QComponentPrivate()
{
}
@@ -58,7 +58,7 @@ void QLayer::copy(const QNode *ref)
}
QLayer::QLayer(QNode *parent)
- : QComponent(*new QLayerPrivate(this), parent)
+ : QComponent(*new QLayerPrivate, parent)
{
}
diff --git a/src/render/frontend/qlayer_p.h b/src/render/frontend/qlayer_p.h
index abc5a031a..affd71bb4 100644
--- a/src/render/frontend/qlayer_p.h
+++ b/src/render/frontend/qlayer_p.h
@@ -48,7 +48,7 @@ namespace Qt3D {
class QT3DRENDERERSHARED_EXPORT QLayerPrivate : QComponentPrivate
{
public:
- QLayerPrivate(QLayer *qq);
+ QLayerPrivate();
Q_DECLARE_PUBLIC(QLayer)
QStringList m_names;
diff --git a/src/render/frontend/qmaterial.cpp b/src/render/frontend/qmaterial.cpp
index 4cd5713ba..54efb6709 100644
--- a/src/render/frontend/qmaterial.cpp
+++ b/src/render/frontend/qmaterial.cpp
@@ -67,8 +67,8 @@ namespace Qt3D {
\class Qt3D::QMaterialPrivate
\internal
*/
-QMaterialPrivate::QMaterialPrivate(QMaterial *qq)
- : QComponentPrivate(qq)
+QMaterialPrivate::QMaterialPrivate()
+ : QComponentPrivate()
, m_effect(Q_NULLPTR)
{
}
@@ -85,7 +85,7 @@ void QMaterial::copy(const QNode *ref)
}
QMaterial::QMaterial(QNode *parent)
- : QComponent(*new QMaterialPrivate(this), parent)
+ : QComponent(*new QMaterialPrivate, parent)
{
}
diff --git a/src/render/frontend/qmaterial_p.h b/src/render/frontend/qmaterial_p.h
index 13e6dd7fb..e11e7258d 100644
--- a/src/render/frontend/qmaterial_p.h
+++ b/src/render/frontend/qmaterial_p.h
@@ -50,7 +50,7 @@ class QEffect;
class QT3DRENDERERSHARED_EXPORT QMaterialPrivate : public QComponentPrivate
{
public:
- QMaterialPrivate(QMaterial *qq);
+ QMaterialPrivate();
Q_DECLARE_PUBLIC(QMaterial)
QList<QParameter *> m_parameters;
diff --git a/src/render/frontend/qmesh.cpp b/src/render/frontend/qmesh.cpp
index a8b7858e5..660fd26e5 100644
--- a/src/render/frontend/qmesh.cpp
+++ b/src/render/frontend/qmesh.cpp
@@ -65,9 +65,10 @@ private:
\class Qt3D::QMeshPrivate
\internal
*/
-QMeshPrivate::QMeshPrivate(QMesh *qq)
- : QAbstractMeshPrivate(qq)
-{}
+QMeshPrivate::QMeshPrivate()
+ : QAbstractMeshPrivate()
+{
+}
void QMesh::copy(const QNode *ref)
{
@@ -77,7 +78,7 @@ void QMesh::copy(const QNode *ref)
}
QMesh::QMesh(QNode *parent)
- : QAbstractMesh(*new QMeshPrivate(this), parent)
+ : QAbstractMesh(*new QMeshPrivate, parent)
{
}
diff --git a/src/render/frontend/qmesh_p.h b/src/render/frontend/qmesh_p.h
index feca183c8..c663999b7 100644
--- a/src/render/frontend/qmesh_p.h
+++ b/src/render/frontend/qmesh_p.h
@@ -51,7 +51,7 @@ class QMesh;
class QT3DRENDERERSHARED_EXPORT QMeshPrivate : public QAbstractMeshPrivate
{
public:
- QMeshPrivate(QMesh *qq);
+ QMeshPrivate();
Q_DECLARE_PUBLIC(QMesh)
diff --git a/src/render/frontend/qparameter.cpp b/src/render/frontend/qparameter.cpp
index 38833d8a9..92cb0d4d8 100644
--- a/src/render/frontend/qparameter.cpp
+++ b/src/render/frontend/qparameter.cpp
@@ -49,8 +49,8 @@ namespace Qt3D {
\class Qt3D::QParameterPrivate
\internal
*/
-QParameterPrivate::QParameterPrivate(QParameter *qq)
- : QNodePrivate(qq)
+QParameterPrivate::QParameterPrivate()
+ : QNodePrivate()
{
}
@@ -74,12 +74,12 @@ QParameter::QParameter(QParameterPrivate &dd, QNode *parent)
}
QParameter::QParameter(QNode *parent)
- : QNode(*new QParameterPrivate(this), parent)
+ : QNode(*new QParameterPrivate, parent)
{
}
QParameter::QParameter(const QString &name, const QVariant &value, QNode *parent)
- : QNode(*new QParameterPrivate(this), parent)
+ : QNode(*new QParameterPrivate, parent)
{
Q_D(QParameter);
d->m_name = name;
@@ -87,7 +87,7 @@ QParameter::QParameter(const QString &name, const QVariant &value, QNode *parent
}
QParameter::QParameter(const QString &name, QAbstractTextureProvider *texture, QNode *parent)
- : QNode(*new QParameterPrivate(this), parent)
+ : QNode(*new QParameterPrivate, parent)
{
Q_D(QParameter);
d->m_name = name;
diff --git a/src/render/frontend/qparameter_p.h b/src/render/frontend/qparameter_p.h
index 668887244..bc7fe7f30 100644
--- a/src/render/frontend/qparameter_p.h
+++ b/src/render/frontend/qparameter_p.h
@@ -49,7 +49,7 @@ class QParameter;
class QT3DRENDERERSHARED_PRIVATE_EXPORT QParameterPrivate : public QNodePrivate
{
public:
- QParameterPrivate(QParameter *qq);
+ QParameterPrivate();
Q_DECLARE_PUBLIC(QParameter)
diff --git a/src/render/frontend/qparametermapping.cpp b/src/render/frontend/qparametermapping.cpp
index 0d9910e2e..ab61f4c77 100644
--- a/src/render/frontend/qparametermapping.cpp
+++ b/src/render/frontend/qparametermapping.cpp
@@ -45,8 +45,8 @@ namespace Qt3D {
\class Qt3D::QParameterMappingPrivate
\internal
*/
-QParameterMappingPrivate::QParameterMappingPrivate(QParameterMapping *qq)
- : QNodePrivate(qq)
+QParameterMappingPrivate::QParameterMappingPrivate()
+ : QNodePrivate()
, m_bindingType(QParameterMapping::Uniform)
{
}
@@ -61,7 +61,7 @@ void QParameterMapping::copy(const QNode *ref)
}
QParameterMapping::QParameterMapping(QNode *parent)
- : QNode(*new QParameterMappingPrivate(this), parent)
+ : QNode(*new QParameterMappingPrivate, parent)
{
}
@@ -72,7 +72,7 @@ QParameterMapping::QParameterMapping(QParameterMappingPrivate &dd, QNode *parent
}
QParameterMapping::QParameterMapping(const QString &parameterName, const QString &shaderParameterName, QParameterMapping::Binding bindingType, QNode *parent)
- : QNode(*new QParameterMappingPrivate(this), parent)
+ : QNode(*new QParameterMappingPrivate, parent)
{
Q_D(QParameterMapping);
d->m_parameterName = parameterName;
diff --git a/src/render/frontend/qparametermapping_p.h b/src/render/frontend/qparametermapping_p.h
index 234afcf39..6f0234c69 100644
--- a/src/render/frontend/qparametermapping_p.h
+++ b/src/render/frontend/qparametermapping_p.h
@@ -47,7 +47,7 @@ namespace Qt3D {
class QParameterMappingPrivate : public QNodePrivate
{
public:
- QParameterMappingPrivate(QParameterMapping *qq);
+ QParameterMappingPrivate();
Q_DECLARE_PUBLIC(QParameterMapping)
diff --git a/src/render/frontend/qplanemesh.cpp b/src/render/frontend/qplanemesh.cpp
index 7d31df1bd..6aca02247 100644
--- a/src/render/frontend/qplanemesh.cpp
+++ b/src/render/frontend/qplanemesh.cpp
@@ -52,8 +52,8 @@ namespace Qt3D {
\class Qt3D::QPlaneMeshPrivate
\internal
*/
-QPlaneMeshPrivate::QPlaneMeshPrivate(QPlaneMesh *qq)
- : QAbstractMeshPrivate(qq)
+QPlaneMeshPrivate::QPlaneMeshPrivate()
+ : QAbstractMeshPrivate()
, m_width(1.0f)
, m_height(1.0f)
, m_meshResolution(2, 2)
@@ -61,7 +61,7 @@ QPlaneMeshPrivate::QPlaneMeshPrivate(QPlaneMesh *qq)
}
QPlaneMesh::QPlaneMesh(QNode *parent)
- : QAbstractMesh(*new QPlaneMeshPrivate(this), parent)
+ : QAbstractMesh(*new QPlaneMeshPrivate, parent)
{
update();
}
diff --git a/src/render/frontend/qplanemesh_p.h b/src/render/frontend/qplanemesh_p.h
index 5d8982688..624635342 100644
--- a/src/render/frontend/qplanemesh_p.h
+++ b/src/render/frontend/qplanemesh_p.h
@@ -49,7 +49,7 @@ class QPlaneMesh;
class QPlaneMeshPrivate : public QAbstractMeshPrivate
{
public:
- QPlaneMeshPrivate(QPlaneMesh *qq);
+ QPlaneMeshPrivate();
Q_DECLARE_PUBLIC(QPlaneMesh)
diff --git a/src/render/frontend/qpointlight.cpp b/src/render/frontend/qpointlight.cpp
index 2d1c9ed43..eca6af8b0 100644
--- a/src/render/frontend/qpointlight.cpp
+++ b/src/render/frontend/qpointlight.cpp
@@ -63,13 +63,13 @@ namespace Qt3D {
\class Qt3D::QPointLightPrivate
\internal
*/
-QPointLightPrivate::QPointLightPrivate(QPointLight *qq)
- : QAbstractLightPrivate(qq)
+QPointLightPrivate::QPointLightPrivate()
+ : QAbstractLightPrivate()
{
}
QPointLight::QPointLight(QNode *parent)
- : QAbstractLight(*new QPointLightPrivate(this), parent)
+ : QAbstractLight(*new QPointLightPrivate, parent)
{
}
diff --git a/src/render/frontend/qpointlight_p.h b/src/render/frontend/qpointlight_p.h
index 3b377f879..0e98319ed 100644
--- a/src/render/frontend/qpointlight_p.h
+++ b/src/render/frontend/qpointlight_p.h
@@ -48,7 +48,7 @@ class QPointLight;
class QT3DRENDERERSHARED_EXPORT QPointLightPrivate : public QAbstractLightPrivate
{
public:
- QPointLightPrivate(QPointLight *qq);
+ QPointLightPrivate();
Q_DECLARE_PUBLIC(QPointLight)
};
diff --git a/src/render/frontend/qpolygonoffset.cpp b/src/render/frontend/qpolygonoffset.cpp
index 13bb2ad9a..192e1ef02 100644
--- a/src/render/frontend/qpolygonoffset.cpp
+++ b/src/render/frontend/qpolygonoffset.cpp
@@ -44,8 +44,8 @@ namespace Qt3D {
class QPolygonOffsetPrivate : public QRenderStatePrivate
{
public:
- QPolygonOffsetPrivate(QPolygonOffset *qq)
- : QRenderStatePrivate(qq, QRenderState::PolygonOffset)
+ QPolygonOffsetPrivate()
+ : QRenderStatePrivate(QRenderState::PolygonOffset)
, m_factor(0)
, m_units(0)
{
@@ -58,7 +58,7 @@ public:
};
QPolygonOffset::QPolygonOffset(QNode *parent)
- : QRenderState(*new QPolygonOffsetPrivate(this), parent)
+ : QRenderState(*new QPolygonOffsetPrivate, parent)
{
}
diff --git a/src/render/frontend/qrenderattachment.cpp b/src/render/frontend/qrenderattachment.cpp
index f4445895e..8e3fd30af 100644
--- a/src/render/frontend/qrenderattachment.cpp
+++ b/src/render/frontend/qrenderattachment.cpp
@@ -46,8 +46,8 @@ namespace Qt3D {
\class Qt3D::QRenderAttachmentPrivate
\internal
*/
-QRenderAttachmentPrivate::QRenderAttachmentPrivate(QRenderAttachment *qq)
- : QNodePrivate(qq)
+QRenderAttachmentPrivate::QRenderAttachmentPrivate()
+ : QNodePrivate()
, m_texture(Q_NULLPTR)
, m_type(QRenderAttachment::ColorAttachment0)
, m_mipLevel(0)
@@ -65,7 +65,7 @@ void QRenderAttachment::copy(const QNode *ref)
}
QRenderAttachment::QRenderAttachment(QNode *parent)
- : QNode(*new QRenderAttachmentPrivate(this), parent)
+ : QNode(*new QRenderAttachmentPrivate, parent)
{
}
diff --git a/src/render/frontend/qrenderattachment_p.h b/src/render/frontend/qrenderattachment_p.h
index f9e95cf83..8425c36e9 100644
--- a/src/render/frontend/qrenderattachment_p.h
+++ b/src/render/frontend/qrenderattachment_p.h
@@ -49,7 +49,7 @@ class QAbstractTextureProvider;
class QRenderAttachmentPrivate : public QNodePrivate
{
public:
- QRenderAttachmentPrivate(QRenderAttachment *qq);
+ QRenderAttachmentPrivate();
Q_DECLARE_PUBLIC(QRenderAttachment)
diff --git a/src/render/frontend/qrenderpass.cpp b/src/render/frontend/qrenderpass.cpp
index 2aa9683a0..b6b16dbd6 100644
--- a/src/render/frontend/qrenderpass.cpp
+++ b/src/render/frontend/qrenderpass.cpp
@@ -52,8 +52,8 @@ namespace Qt3D {
\class Qt3D::QRenderPassPrivate
\internal
*/
-QRenderPassPrivate::QRenderPassPrivate(QRenderPass *qq)
- : QNodePrivate(qq)
+QRenderPassPrivate::QRenderPassPrivate()
+ : QNodePrivate()
, m_shader(Q_NULLPTR)
{
}
@@ -73,7 +73,7 @@ void QRenderPass::copy(const QNode *ref)
}
QRenderPass::QRenderPass(QNode *parent)
- : QNode(*new QRenderPassPrivate(this), parent)
+ : QNode(*new QRenderPassPrivate, parent)
{
}
diff --git a/src/render/frontend/qrenderpass_p.h b/src/render/frontend/qrenderpass_p.h
index 33017fd83..cf21a23f7 100644
--- a/src/render/frontend/qrenderpass_p.h
+++ b/src/render/frontend/qrenderpass_p.h
@@ -60,7 +60,7 @@ class RenderStateSet;
class QT3DRENDERERSHARED_EXPORT QRenderPassPrivate : public QNodePrivate
{
public:
- QRenderPassPrivate(QRenderPass *qq);
+ QRenderPassPrivate();
Q_DECLARE_PUBLIC(QRenderPass)
ParameterList m_attributes;
diff --git a/src/render/frontend/qrenderstate.cpp b/src/render/frontend/qrenderstate.cpp
index 69154c155..1b13b5d03 100644
--- a/src/render/frontend/qrenderstate.cpp
+++ b/src/render/frontend/qrenderstate.cpp
@@ -46,8 +46,8 @@ namespace Qt3D {
\class Qt3D::QRenderStatePrivate
\internal
*/
-QRenderStatePrivate::QRenderStatePrivate(QRenderState *qq, QRenderState::Type type)
- : QNodePrivate(qq),
+QRenderStatePrivate::QRenderStatePrivate(QRenderState::Type type)
+ : QNodePrivate(),
m_type(type)
{
}
diff --git a/src/render/frontend/qrenderstate_p.h b/src/render/frontend/qrenderstate_p.h
index fca72507a..8ae1dd5c3 100644
--- a/src/render/frontend/qrenderstate_p.h
+++ b/src/render/frontend/qrenderstate_p.h
@@ -48,8 +48,7 @@ namespace Qt3D {
class QRenderStatePrivate : public QNodePrivate
{
public:
-
- QRenderStatePrivate(QRenderState *qq, QRenderState::Type type);
+ QRenderStatePrivate(QRenderState::Type type);
Q_DECLARE_PUBLIC(QRenderState)
const QRenderState::Type m_type;
diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp
index 764ab04c1..532a803c8 100644
--- a/src/render/frontend/qrendertarget.cpp
+++ b/src/render/frontend/qrendertarget.cpp
@@ -47,8 +47,8 @@ namespace Qt3D {
\class Qt3D::QRenderTargetPrivate
\internal
*/
-QRenderTargetPrivate::QRenderTargetPrivate(QRenderTarget *qq)
- : QComponentPrivate(qq)
+QRenderTargetPrivate::QRenderTargetPrivate()
+ : QComponentPrivate()
{
}
@@ -61,7 +61,7 @@ void QRenderTarget::copy(const QNode *ref)
}
QRenderTarget::QRenderTarget(QNode *parent)
- : QComponent(*new QRenderTargetPrivate(this), parent)
+ : QComponent(*new QRenderTargetPrivate, parent)
{
}
diff --git a/src/render/frontend/qrendertarget_p.h b/src/render/frontend/qrendertarget_p.h
index b55161a49..50faf7308 100644
--- a/src/render/frontend/qrendertarget_p.h
+++ b/src/render/frontend/qrendertarget_p.h
@@ -49,7 +49,7 @@ class QRenderTarget;
class QRenderTargetPrivate : public QComponentPrivate
{
public:
- QRenderTargetPrivate(QRenderTarget *qq);
+ QRenderTargetPrivate();
Q_DECLARE_PUBLIC(QRenderTarget)
QList<QRenderAttachment *> m_attachments;
diff --git a/src/render/frontend/qscissortest.cpp b/src/render/frontend/qscissortest.cpp
index 0a5a724a5..5c8922d5f 100644
--- a/src/render/frontend/qscissortest.cpp
+++ b/src/render/frontend/qscissortest.cpp
@@ -48,8 +48,8 @@ namespace Qt3D {
class QScissorTestPrivate : public QRenderStatePrivate
{
public:
- QScissorTestPrivate(QScissorTest *qq)
- : QRenderStatePrivate(qq, QRenderState::ScissorTest)
+ QScissorTestPrivate()
+ : QRenderStatePrivate(QRenderState::ScissorTest)
, m_left(0)
, m_bottom(0)
, m_width(0)
@@ -65,7 +65,7 @@ public:
};
QScissorTest::QScissorTest(QNode *parent)
- : QRenderState(*new QScissorTestPrivate(this), parent)
+ : QRenderState(*new QScissorTestPrivate, parent)
{
}
diff --git a/src/render/frontend/qshaderdata.cpp b/src/render/frontend/qshaderdata.cpp
index 02570091c..6caf7e5b1 100644
--- a/src/render/frontend/qshaderdata.cpp
+++ b/src/render/frontend/qshaderdata.cpp
@@ -45,8 +45,8 @@ namespace Qt3D {
\class Qt3D::QShaderDataPrivate
\internal
*/
-QShaderDataPrivate::QShaderDataPrivate(QShaderData *qq)
- : QComponentPrivate(qq)
+QShaderDataPrivate::QShaderDataPrivate()
+ : QComponentPrivate()
, m_propertyReader(PropertyReaderInterfacePtr(new QShaderDataPropertyReader()))
{
}
@@ -55,8 +55,8 @@ QShaderDataPrivate::QShaderDataPrivate(QShaderData *qq)
\class Qt3D::QShaderDataPrivate
\internal
*/
-QShaderDataPrivate::QShaderDataPrivate(QShaderData *qq, PropertyReaderInterfacePtr reader)
- : QComponentPrivate(qq)
+QShaderDataPrivate::QShaderDataPrivate(PropertyReaderInterfacePtr reader)
+ : QComponentPrivate()
, m_propertyReader(reader)
{
}
@@ -75,7 +75,7 @@ QShaderDataPrivate::QShaderDataPrivate(QShaderData *qq, PropertyReaderInterfaceP
*/
QShaderData::QShaderData(QNode *parent)
- : QComponent(*new QShaderDataPrivate(this), parent)
+ : QComponent(*new QShaderDataPrivate, parent)
{
}
diff --git a/src/render/frontend/qshaderdata_p.h b/src/render/frontend/qshaderdata_p.h
index 95512d5c6..cdd30aec4 100644
--- a/src/render/frontend/qshaderdata_p.h
+++ b/src/render/frontend/qshaderdata_p.h
@@ -75,8 +75,8 @@ class QShaderDataPropertyReader: public PropertyReaderInterface
class QT3DRENDERERSHARED_PRIVATE_EXPORT QShaderDataPrivate : public QComponentPrivate
{
public:
- QShaderDataPrivate(QShaderData *qq);
- QShaderDataPrivate(QShaderData *qq, PropertyReaderInterfacePtr reader);
+ QShaderDataPrivate();
+ QShaderDataPrivate(PropertyReaderInterfacePtr reader);
PropertyReaderInterfacePtr m_propertyReader;
Q_DECLARE_PUBLIC(QShaderData)
diff --git a/src/render/frontend/qshaderprogram.cpp b/src/render/frontend/qshaderprogram.cpp
index 8e9e2eaf4..7eb170b6b 100644
--- a/src/render/frontend/qshaderprogram.cpp
+++ b/src/render/frontend/qshaderprogram.cpp
@@ -50,8 +50,8 @@ namespace Qt3D {
\class Qt3D::QShaderProgramPrivate
\internal
*/
-QShaderProgramPrivate::QShaderProgramPrivate(QShaderProgram *qq)
- : QNodePrivate(qq)
+QShaderProgramPrivate::QShaderProgramPrivate()
+ : QNodePrivate()
{
}
@@ -69,7 +69,7 @@ void QShaderProgram::copy(const QNode *ref)
}
QShaderProgram::QShaderProgram(QNode *parent)
- : QNode(*new QShaderProgramPrivate(this), parent)
+ : QNode(*new QShaderProgramPrivate, parent)
{
}
diff --git a/src/render/frontend/qshaderprogram_p.h b/src/render/frontend/qshaderprogram_p.h
index 07cd91c59..455436a8a 100644
--- a/src/render/frontend/qshaderprogram_p.h
+++ b/src/render/frontend/qshaderprogram_p.h
@@ -48,7 +48,7 @@ class QShaderProgram;
class QShaderProgramPrivate : public QNodePrivate
{
public:
- QShaderProgramPrivate(QShaderProgram *qq);
+ QShaderProgramPrivate();
Q_DECLARE_PUBLIC(QShaderProgram)
QString m_vertexSourceFile;
diff --git a/src/render/frontend/qspheremesh.cpp b/src/render/frontend/qspheremesh.cpp
index 0ede65d43..7e103e8fe 100644
--- a/src/render/frontend/qspheremesh.cpp
+++ b/src/render/frontend/qspheremesh.cpp
@@ -68,8 +68,8 @@ private:
class QSphereMeshPrivate : public QAbstractMeshPrivate
{
- QSphereMeshPrivate(QSphereMesh *qq)
- : QAbstractMeshPrivate(qq)
+ QSphereMeshPrivate()
+ : QAbstractMeshPrivate()
, m_generateTangents(false)
, m_rings(16)
, m_slices(16)
@@ -84,7 +84,7 @@ class QSphereMeshPrivate : public QAbstractMeshPrivate
};
QSphereMesh::QSphereMesh(QNode *parent)
- : QAbstractMesh(*new QSphereMeshPrivate(this), parent)
+ : QAbstractMesh(*new QSphereMeshPrivate, parent)
{
update();
}
diff --git a/src/render/frontend/qspotlight.cpp b/src/render/frontend/qspotlight.cpp
index edb6243a3..bbac94b4c 100644
--- a/src/render/frontend/qspotlight.cpp
+++ b/src/render/frontend/qspotlight.cpp
@@ -67,8 +67,8 @@ namespace Qt3D {
\class Qt3D::QSpotLightPrivate
\internal
*/
-QSpotLightPrivate::QSpotLightPrivate(QSpotLight *qq)
- : QAbstractLightPrivate(qq)
+QSpotLightPrivate::QSpotLightPrivate()
+ : QAbstractLightPrivate()
, m_cutOffAngle(45.0f)
{
}
@@ -84,7 +84,7 @@ void QSpotLight::copy(const QNode *ref)
}
QSpotLight::QSpotLight(QNode *parent)
- : QAbstractLight(*new QSpotLightPrivate(this), parent)
+ : QAbstractLight(*new QSpotLightPrivate, parent)
{
}
diff --git a/src/render/frontend/qspotlight_p.h b/src/render/frontend/qspotlight_p.h
index 1ad4efa63..d05ec446d 100644
--- a/src/render/frontend/qspotlight_p.h
+++ b/src/render/frontend/qspotlight_p.h
@@ -46,7 +46,7 @@ namespace Qt3D {
class QT3DRENDERERSHARED_EXPORT QSpotLightPrivate : public QAbstractLightPrivate
{
public:
- QSpotLightPrivate(QSpotLight *qq);
+ QSpotLightPrivate();
Q_DECLARE_PUBLIC(QSpotLight)
float m_cutOffAngle;
diff --git a/src/render/frontend/qstenciltest.cpp b/src/render/frontend/qstenciltest.cpp
index 307c6c155..2ff78625d 100644
--- a/src/render/frontend/qstenciltest.cpp
+++ b/src/render/frontend/qstenciltest.cpp
@@ -48,8 +48,8 @@ namespace Qt3D {
class QStencilTestPrivate : public QRenderStatePrivate
{
public:
- QStencilTestPrivate(QStencilTest *qq)
- : QRenderStatePrivate(qq, QRenderState::StencilTest)
+ QStencilTestPrivate()
+ : QRenderStatePrivate(QRenderState::StencilTest)
, m_mask(0)
, m_func(QStencilTest::Never)
, m_faceMode(QStencilTest::FrontAndBack)
@@ -63,7 +63,7 @@ public:
};
QStencilTest::QStencilTest(QNode *parent)
- : QRenderState(*new QStencilTestPrivate(this), parent)
+ : QRenderState(*new QStencilTestPrivate, parent)
{
}
diff --git a/src/render/frontend/qtechnique.cpp b/src/render/frontend/qtechnique.cpp
index 4ce110c5e..dd72ec458 100644
--- a/src/render/frontend/qtechnique.cpp
+++ b/src/render/frontend/qtechnique.cpp
@@ -49,8 +49,8 @@ namespace Qt3D {
\class Qt3D::QTechniquePrivate
\internal
*/
-QTechniquePrivate::QTechniquePrivate(QTechnique *qq)
- : QNodePrivate(qq)
+QTechniquePrivate::QTechniquePrivate()
+ : QNodePrivate()
{
}
@@ -59,7 +59,7 @@ QTechniquePrivate::~QTechniquePrivate()
}
QTechnique::QTechnique(QNode *parent)
- : QNode(*new QTechniquePrivate(this), parent)
+ : QNode(*new QTechniquePrivate, parent)
{
Q_D(QTechnique);
QObject::connect(&d->m_openGLFilter, SIGNAL(openGLFilterChanged()), this, SLOT(_q_openGLFilterChanged()));
diff --git a/src/render/frontend/qtechnique_p.h b/src/render/frontend/qtechnique_p.h
index df9a4c09e..6ae35f1e1 100644
--- a/src/render/frontend/qtechnique_p.h
+++ b/src/render/frontend/qtechnique_p.h
@@ -53,7 +53,7 @@ class QRenderPass;
class QT3DRENDERERSHARED_EXPORT QTechniquePrivate : public QNodePrivate
{
public:
- QTechniquePrivate(QTechnique *dd);
+ QTechniquePrivate();
~QTechniquePrivate();
Q_DECLARE_PUBLIC(QTechnique)
diff --git a/src/render/frontend/qtextureimage.cpp b/src/render/frontend/qtextureimage.cpp
index 6a46f8b68..8954b6334 100644
--- a/src/render/frontend/qtextureimage.cpp
+++ b/src/render/frontend/qtextureimage.cpp
@@ -45,8 +45,8 @@ namespace Qt3D {
class QTextureImagePrivate: public QAbstractTextureImagePrivate
{
public:
- QTextureImagePrivate(QTextureImage *qq)
- : QAbstractTextureImagePrivate(qq)
+ QTextureImagePrivate()
+ : QAbstractTextureImagePrivate()
{
}
@@ -105,7 +105,7 @@ private:
Constructs a new Qt3D::QTextureImage instance with \a parent as parent.
*/
QTextureImage::QTextureImage(QNode *parent)
- : QAbstractTextureImage(*new QTextureImagePrivate(this), parent)
+ : QAbstractTextureImage(*new QTextureImagePrivate, parent)
{
}
diff --git a/src/render/frontend/qtorusmesh.cpp b/src/render/frontend/qtorusmesh.cpp
index 09b4e2a54..4a975d8d8 100644
--- a/src/render/frontend/qtorusmesh.cpp
+++ b/src/render/frontend/qtorusmesh.cpp
@@ -67,8 +67,8 @@ private:
class QTorusMeshPrivate : public QAbstractMeshPrivate
{
- QTorusMeshPrivate(QTorusMesh *qq)
- : QAbstractMeshPrivate(qq)
+ QTorusMeshPrivate()
+ : QAbstractMeshPrivate()
, m_rings(16)
, m_slices(16)
, m_radius(1.0)
@@ -94,7 +94,7 @@ void QTorusMesh::copy(const QNode *ref)
QTorusMesh::QTorusMesh(QNode *parent)
- : QAbstractMesh(*new QTorusMeshPrivate(this), parent)
+ : QAbstractMesh(*new QTorusMeshPrivate, parent)
{
update();
}
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp
index d3848473e..68aa14826 100644
--- a/src/render/io/gltfparser.cpp
+++ b/src/render/io/gltfparser.cpp
@@ -235,11 +235,9 @@ private:
class GLTFParserMeshPrivate : public QAbstractMeshPrivate
{
public:
-
- GLTFParserMeshPrivate(GLTFParserMesh *qq)
- : QAbstractMeshPrivate(qq)
- {
- }
+ GLTFParserMeshPrivate()
+ : QAbstractMeshPrivate()
+ {}
Q_DECLARE_PUBLIC(GLTFParserMesh)
QMeshDataPtr m_meshData;
@@ -1014,7 +1012,7 @@ void GLTFParserMesh::copy(const QNode *ref)
}
GLTFParserMesh::GLTFParserMesh(QNode *parent)
- : QAbstractMesh(*new GLTFParserMeshPrivate(this), parent)
+ : QAbstractMesh(*new GLTFParserMeshPrivate, parent)
{
}