diff options
Diffstat (limited to 'src/render/frontend/framegraph-components')
26 files changed, 51 insertions, 51 deletions
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; |