diff options
Diffstat (limited to 'src/render/frontend/framegraph-components')
41 files changed, 258 insertions, 249 deletions
diff --git a/src/render/frontend/framegraph-components/qcameraselector.cpp b/src/render/frontend/framegraph-components/qcameraselector.cpp index 5085adf45..d77c493e9 100644 --- a/src/render/frontend/framegraph-components/qcameraselector.cpp +++ b/src/render/frontend/framegraph-components/qcameraselector.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! \class Qt3D::CameraSelector @@ -55,7 +55,7 @@ QCameraSelector::QCameraSelector(QCameraSelectorPrivate &dd, QNode *parent) } /*! - \class Qt3D::QCameraSelectorPrivate + \class Qt3DRender::QCameraSelectorPrivate \internal */ QCameraSelectorPrivate::QCameraSelectorPrivate() @@ -69,7 +69,7 @@ void QCameraSelector::copy(const QNode *ref) const QCameraSelector *other = static_cast<const QCameraSelector*>(ref); if (other->d_func()->m_camera) - setCamera(qobject_cast<QEntity *>(QNode::clone(other->d_func()->m_camera))); + setCamera(qobject_cast<Qt3D::QEntity *>(QNode::clone(other->d_func()->m_camera))); } QCameraSelector::QCameraSelector(Qt3D::QNode *parent) @@ -81,7 +81,7 @@ QCameraSelector::~QCameraSelector() QNode::cleanup(); } -void QCameraSelector::setCamera(QEntity *camera) +void QCameraSelector::setCamera(Qt3D::QEntity *camera) { Q_D(QCameraSelector); if (d->m_camera != camera) { @@ -97,12 +97,12 @@ void QCameraSelector::setCamera(QEntity *camera) } } -QEntity *QCameraSelector::camera() const +Qt3D::QEntity *QCameraSelector::camera() const { Q_D(const QCameraSelector); return d->m_camera; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qcameraselector.h b/src/render/frontend/framegraph-components/qcameraselector.h index 4811d7a96..546d77a61 100644 --- a/src/render/frontend/framegraph-components/qcameraselector.h +++ b/src/render/frontend/framegraph-components/qcameraselector.h @@ -34,17 +34,16 @@ ** ****************************************************************************/ -#ifndef QT3D_QCAMERASELECTOR_H -#define QT3D_QCAMERASELECTOR_H +#ifndef QT3DRENDER_QCAMERASELECTOR_H +#define QT3DRENDER_QCAMERASELECTOR_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/qframegraphnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { -class QCamera; class QCameraSelectorPrivate; class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphNode @@ -53,27 +52,27 @@ class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphNode Q_PROPERTY(Qt3D::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) public: - explicit QCameraSelector(QNode *parent = 0); + explicit QCameraSelector(Qt3D::QNode *parent = 0); ~QCameraSelector(); - void setCamera(QEntity *camera); - QEntity *camera() const; + void setCamera(Qt3D::QEntity *camera); + Qt3D::QEntity *camera() const; Q_SIGNALS: void cameraChanged(); protected: - QCameraSelector(QCameraSelectorPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QCameraSelector(QCameraSelectorPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: QT3D_CLONEABLE(QCameraSelector) Q_DECLARE_PRIVATE(QCameraSelector) }; -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QCAMERASELECTOR_H +#endif // QT3DRENDER_QCAMERASELECTOR_H diff --git a/src/render/frontend/framegraph-components/qcameraselector_p.h b/src/render/frontend/framegraph-components/qcameraselector_p.h index 1ef076557..bcf00d6b6 100644 --- a/src/render/frontend/framegraph-components/qcameraselector_p.h +++ b/src/render/frontend/framegraph-components/qcameraselector_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QCAMERASELECTOR_P_H -#define QT3D_QCAMERASELECTOR_P_H +#ifndef QT3DRENDER_QCAMERASELECTOR_P_H +#define QT3DRENDER_QCAMERASELECTOR_P_H #include <private/qframegraphnode_p.h> #include <Qt3DRenderer/qcameraselector.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QCameraSelector; @@ -52,12 +52,12 @@ public: QCameraSelectorPrivate(); Q_DECLARE_PUBLIC(QCameraSelector) - QEntity *m_camera; + Qt3D::QEntity *m_camera; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QCAMERASELECTOR_P_H +#endif // QT3DRENDER_QCAMERASELECTOR_P_H diff --git a/src/render/frontend/framegraph-components/qclearbuffer.cpp b/src/render/frontend/framegraph-components/qclearbuffer.cpp index f40a80883..5706f6aa7 100644 --- a/src/render/frontend/framegraph-components/qclearbuffer.cpp +++ b/src/render/frontend/framegraph-components/qclearbuffer.cpp @@ -40,10 +40,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QClearBufferPrivate + \class Qt3DRender::QClearBufferPrivate \internal */ QClearBufferPrivate::QClearBufferPrivate() @@ -91,6 +91,6 @@ void QClearBuffer::setBuffers(QClearBuffer::BufferType buffers) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qclearbuffer.h b/src/render/frontend/framegraph-components/qclearbuffer.h index 782ec6ef4..9b42cb46c 100644 --- a/src/render/frontend/framegraph-components/qclearbuffer.h +++ b/src/render/frontend/framegraph-components/qclearbuffer.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QCLEARBUFFER_H -#define QT3D_QCLEARBUFFER_H +#ifndef QT3DRENDER_QCLEARBUFFER_H +#define QT3DRENDER_QCLEARBUFFER_H #include <Qt3DRenderer/qframegraphnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QClearBufferPrivate; @@ -50,7 +50,7 @@ class QT3DRENDERERSHARED_EXPORT QClearBuffer : public QFrameGraphNode Q_OBJECT Q_PROPERTY(BufferType buffers READ buffers WRITE setBuffers NOTIFY buffersChanged) public: - explicit QClearBuffer(QNode *parent = 0); + explicit QClearBuffer(Qt3D::QNode *parent = 0); ~QClearBuffer(); enum BufferType { @@ -72,16 +72,16 @@ Q_SIGNALS: void buffersChanged(); protected: - QClearBuffer(QClearBufferPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QClearBuffer(QClearBufferPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QClearBuffer) QT3D_CLONEABLE(QClearBuffer) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QCLEARBUFFER_H +#endif // QT3DRENDER_QCLEARBUFFER_H diff --git a/src/render/frontend/framegraph-components/qclearbuffer_p.h b/src/render/frontend/framegraph-components/qclearbuffer_p.h index f78b89429..402f956a2 100644 --- a/src/render/frontend/framegraph-components/qclearbuffer_p.h +++ b/src/render/frontend/framegraph-components/qclearbuffer_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QCLEARBUFFER_P_H -#define QT3D_QCLEARBUFFER_P_H +#ifndef QT3DRENDER_QCLEARBUFFER_P_H +#define QT3DRENDER_QCLEARBUFFER_P_H #include <private/qframegraphnode_p.h> #include <Qt3DRenderer/qclearbuffer.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QClearBufferPrivate : public QFrameGraphNodePrivate { @@ -53,8 +53,8 @@ public: QClearBuffer::BufferType m_buffersType; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QCLEARBUFFER_P_H +#endif // QT3DRENDER_QCLEARBUFFER_P_H diff --git a/src/render/frontend/framegraph-components/qframegraph.cpp b/src/render/frontend/framegraph-components/qframegraph.cpp index fdf9724ee..b8357f396 100644 --- a/src/render/frontend/framegraph-components/qframegraph.cpp +++ b/src/render/frontend/framegraph-components/qframegraph.cpp @@ -42,10 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QFrameGraphPrivate + \class Qt3DRender::QFrameGraphPrivate \internal */ QFrameGraphPrivate::QFrameGraphPrivate() @@ -72,14 +72,14 @@ QFrameGraphPrivate::QFrameGraphPrivate() /*! \qmltype FrameGraph - \instantiates Qt3D::QFrameGraph + \instantiates Qt3DRender::QFrameGraph \inherits Component3D \inqmlmodule Qt3D.Renderer \since 5.5 \brief For OpenGL ... */ -/*! \fn void Qt3D::QFrameGraph::copy(const QNode *ref) +/*! \fn void Qt3DRender::QFrameGraph::copy(const QNode *ref) Copies the \a ref instance into this one. */ void QFrameGraph::copy(const QNode *ref) @@ -90,7 +90,7 @@ void QFrameGraph::copy(const QNode *ref) } /*! - \fn Qt3D::QFrameGraph::QFrameGraph(QNode *parent) + \fn Qt3DRender::QFrameGraph::QFrameGraph(QNode *parent) Constructs a new QFrameGraph with the specified \a parent. */ QFrameGraph::QFrameGraph(QNode *parent) @@ -116,7 +116,7 @@ QFrameGraph::QFrameGraph(QFrameGraphPrivate &dd, QNode *parent) */ /*! - \property Qt3D::QFrameGraph::activeFrameGraph + \property Qt3DRender::QFrameGraph::activeFrameGraph Holds the current activeFrameGraph root node. */ @@ -139,6 +139,6 @@ void QFrameGraph::setActiveFrameGraph(QFrameGraphNode *activeFrameGraph) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qframegraph.h b/src/render/frontend/framegraph-components/qframegraph.h index 9dc3fbc76..2a32a95f6 100644 --- a/src/render/frontend/framegraph-components/qframegraph.h +++ b/src/render/frontend/framegraph-components/qframegraph.h @@ -34,29 +34,29 @@ ** ****************************************************************************/ -#ifndef QT3D_QFRAMEGRAPH_H -#define QT3D_QFRAMEGRAPH_H +#ifndef QT3DRENDER_QFRAMEGRAPH_H +#define QT3DRENDER_QFRAMEGRAPH_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DCore/qcomponent.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QFrameGraphPrivate; class QFrameGraphNode; -class QT3DRENDERERSHARED_EXPORT QFrameGraph : public QComponent +class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3D::QComponent { Q_OBJECT // Note : The full namespace has to be used to define the property // otherwise this results in an error "cannot assign object to property" - Q_PROPERTY(Qt3D::QFrameGraphNode *activeFrameGraph READ activeFrameGraph WRITE setActiveFrameGraph NOTIFY activeFrameGraphChanged) + Q_PROPERTY(Qt3DRender::QFrameGraphNode *activeFrameGraph READ activeFrameGraph WRITE setActiveFrameGraph NOTIFY activeFrameGraphChanged) Q_CLASSINFO("DefaultProperty", "activeFrameGraph") public: - explicit QFrameGraph(QNode *parent = 0); + explicit QFrameGraph(Qt3D::QNode *parent = 0); ~QFrameGraph(); QFrameGraphNode *activeFrameGraph() const; @@ -66,16 +66,16 @@ Q_SIGNALS: void activeFrameGraphChanged(); protected: - QFrameGraph(QFrameGraphPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QFrameGraph(QFrameGraphPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QFrameGraph) QT3D_CLONEABLE(QFrameGraph) }; -} //Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QFRAMEGRAPH_H +#endif // QT3DRENDER_QFRAMEGRAPH_H diff --git a/src/render/frontend/framegraph-components/qframegraph_p.h b/src/render/frontend/framegraph-components/qframegraph_p.h index c4963a4ea..0eb8ca7e5 100644 --- a/src/render/frontend/framegraph-components/qframegraph_p.h +++ b/src/render/frontend/framegraph-components/qframegraph_p.h @@ -34,20 +34,20 @@ ** ****************************************************************************/ -#ifndef QT3D_QFRAMEGRAPH_P_H -#define QT3D_QFRAMEGRAPH_P_H +#ifndef QT3DRENDER_QFRAMEGRAPH_P_H +#define QT3DRENDER_QFRAMEGRAPH_P_H #include <Qt3DCore/qt3dcore_global.h> #include <private/qcomponent_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QFrameGraph; class QFrameGraphNode; -class QFrameGraphPrivate : public QComponentPrivate +class QFrameGraphPrivate : public Qt3D::QComponentPrivate { public: QFrameGraphPrivate(); @@ -61,4 +61,4 @@ public: QT_END_NAMESPACE -#endif // QT3D_QFRAMEGRAPH_P_H +#endif // QT3DRENDER_QFRAMEGRAPH_P_H diff --git a/src/render/frontend/framegraph-components/qframegraphnode.cpp b/src/render/frontend/framegraph-components/qframegraphnode.cpp index 78d50782a..1c28d72a0 100644 --- a/src/render/frontend/framegraph-components/qframegraphnode.cpp +++ b/src/render/frontend/framegraph-components/qframegraphnode.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QFrameGraphNodePrivate + \class Qt3DRender::QFrameGraphNodePrivate \internal */ QFrameGraphNodePrivate::QFrameGraphNodePrivate() @@ -82,7 +82,7 @@ QFrameGraphNode::QFrameGraphNode(QNode *parent) QFrameGraphNode::~QFrameGraphNode() { - Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3D::QFrameGraphNode subclass didn't call QNode::cleanup in its destructor"); + Q_ASSERT_X(Qt3D::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QFrameGraphNode subclass didn't call QNode::cleanup in its destructor"); } /*! @@ -114,7 +114,7 @@ QFrameGraphNode::QFrameGraphNode(QFrameGraphNodePrivate &dd, QNode *parent) */ /*! - \property Qt3D::QFrameGraphNode::enabled + \property Qt3DRender::QFrameGraphNode::enabled Holds whether the frame graph node is enabled or disabled. */ @@ -135,6 +135,6 @@ void QFrameGraphNode::setEnabled(bool enabled) } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qframegraphnode.h b/src/render/frontend/framegraph-components/qframegraphnode.h index b13fd6eb6..ce14b9bed 100644 --- a/src/render/frontend/framegraph-components/qframegraphnode.h +++ b/src/render/frontend/framegraph-components/qframegraphnode.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QFRAMEGRAPHNODE_H -#define QT3D_QFRAMEGRAPHNODE_H +#ifndef QT3DRENDER_QFRAMEGRAPHNODE_H +#define QT3DRENDER_QFRAMEGRAPHNODE_H #include <Qt3DCore/qnode.h> #include <Qt3DRenderer/qt3drenderer_global.h> @@ -43,16 +43,16 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QFrameGraphNodePrivate; -class QT3DRENDERERSHARED_EXPORT QFrameGraphNode : public QNode +class QT3DRENDERERSHARED_EXPORT QFrameGraphNode : public Qt3D::QNode { Q_OBJECT Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged) public: - explicit QFrameGraphNode(QNode *parent = 0); + explicit QFrameGraphNode(Qt3D::QNode *parent = 0); ~QFrameGraphNode(); QFrameGraphNode *parentFrameGraphNode() const; @@ -61,7 +61,7 @@ public: void setEnabled(bool enabled); protected: - QFrameGraphNode(QFrameGraphNodePrivate &dd, QNode *parent = 0); + QFrameGraphNode(QFrameGraphNodePrivate &dd, Qt3D::QNode *parent = 0); Q_SIGNALS: void enabledChanged(); @@ -70,8 +70,8 @@ private: Q_DECLARE_PRIVATE(QFrameGraphNode) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QFRAMEGRAPHNODE_H +#endif // QT3DRENDER_QFRAMEGRAPHNODE_H diff --git a/src/render/frontend/framegraph-components/qframegraphnode_p.h b/src/render/frontend/framegraph-components/qframegraphnode_p.h index 02cfc5be1..d1dc98196 100644 --- a/src/render/frontend/framegraph-components/qframegraphnode_p.h +++ b/src/render/frontend/framegraph-components/qframegraphnode_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QFRAMEGRAPHNODE_P_H -#define QT3D_QFRAMEGRAPHNODE_P_H +#ifndef QT3DRENDER_QFRAMEGRAPHNODE_P_H +#define QT3DRENDER_QFRAMEGRAPHNODE_P_H #include <QtCore/QtGlobal> #include <private/qnode_p.h> @@ -43,11 +43,11 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QFrameGraphNode; -class QFrameGraphNodePrivate : public QNodePrivate +class QFrameGraphNodePrivate : public Qt3D::QNodePrivate { public: QFrameGraphNodePrivate(); @@ -57,8 +57,8 @@ public: QList<QFrameGraphNode *> m_fgChildren; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QFRAMEGRAPHNODE_P_H +#endif // QT3DRENDER_QFRAMEGRAPHNODE_P_H diff --git a/src/render/frontend/framegraph-components/qframegraphselector.cpp b/src/render/frontend/framegraph-components/qframegraphselector.cpp index e60872ffe..6d2dc7e6e 100644 --- a/src/render/frontend/framegraph-components/qframegraphselector.cpp +++ b/src/render/frontend/framegraph-components/qframegraphselector.cpp @@ -39,10 +39,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QFrameGraphSelectorPrivate + \class Qt3DRender::QFrameGraphSelectorPrivate \internal */ QFrameGraphSelectorPrivate::QFrameGraphSelectorPrivate() @@ -51,19 +51,19 @@ QFrameGraphSelectorPrivate::QFrameGraphSelectorPrivate() } /*! - \class Qt3D::QFrameGraphSelector + \class Qt3DRender::QFrameGraphSelector \inmodule Qt3DRenderer - \brief Qt3D::QFrameGraphSelector provide a way to select a one or more subtree of + \brief Qt3DRender::QFrameGraphSelector provide a way to select a one or more subtree of the FrameGraph at runtime - The selection is made by executing Qt3D::QFrameGraphSelectorFunctor that will + The selection is made by executing Qt3DRender::QFrameGraphSelectorFunctor that will return a vector containing the indices of the \l {QFrameGraph}{FrameGraph} subtree to be used for the current frame. */ /*! - Constructs a new Qt3D::QFrameGraphSelector instance using \a parent as parent. + Constructs a new Qt3DRender::QFrameGraphSelector instance using \a parent as parent. */ QFrameGraphSelector::QFrameGraphSelector(QNode *parent) : QFrameGraphNode(*new QFrameGraphSelectorPrivate, parent) @@ -99,6 +99,6 @@ void QFrameGraphSelector::copy(const QNode *ref) QFrameGraphNode::copy(ref); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qframegraphselector.h b/src/render/frontend/framegraph-components/qframegraphselector.h index f350539d4..8300be080 100644 --- a/src/render/frontend/framegraph-components/qframegraphselector.h +++ b/src/render/frontend/framegraph-components/qframegraphselector.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QFRAMEGRAPHSELECTOR_H -#define QT3D_QFRAMEGRAPHSELECTOR_H +#ifndef QT3DRENDER_QFRAMEGRAPHSELECTOR_H +#define QT3DRENDER_QFRAMEGRAPHSELECTOR_H #include <Qt3DRenderer/qframegraphnode.h> #include <Qt3DCore/qnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QFrameGraphSelectorPrivate; @@ -59,24 +59,24 @@ class QT3DRENDERERSHARED_EXPORT QFrameGraphSelector : public QFrameGraphNode { Q_OBJECT public: - explicit QFrameGraphSelector(QNode *parent = 0); + explicit QFrameGraphSelector(Qt3D::QNode *parent = 0); ~QFrameGraphSelector(); QFrameGraphSelectorFunctorPtr selectionFunctor() const; void setSelectionFunctor(QFrameGraphSelectorFunctorPtr functor); protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: QT3D_CLONEABLE(QFrameGraphSelector) Q_DECLARE_PRIVATE(QFrameGraphSelector) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QFrameGraphSelectorFunctorPtr) +Q_DECLARE_METATYPE(Qt3DRender::QFrameGraphSelectorFunctorPtr) -#endif // QT3D_QGFRAMEGRAPHSELECTOR_H +#endif // QT3DRENDER_QGFRAMEGRAPHSELECTOR_H diff --git a/src/render/frontend/framegraph-components/qframegraphselector_p.h b/src/render/frontend/framegraph-components/qframegraphselector_p.h index 28228dcdb..b1d63a7fe 100644 --- a/src/render/frontend/framegraph-components/qframegraphselector_p.h +++ b/src/render/frontend/framegraph-components/qframegraphselector_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QFRAMEGRAPHSELECTOR_P_H -#define QT3D_QFRAMEGRAPHSELECTOR_P_H +#ifndef QT3DRENDER_QFRAMEGRAPHSELECTOR_P_H +#define QT3DRENDER_QFRAMEGRAPHSELECTOR_P_H #include <Qt3DRenderer/private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QFrameGraphSelector; class QFrameGraphSelectorFunctor; @@ -57,9 +57,9 @@ public: Q_DECLARE_PUBLIC(QFrameGraphSelector) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QFRAMEGRAPHSELECTOR_P_H +#endif // QT3DRENDER_QFRAMEGRAPHSELECTOR_P_H diff --git a/src/render/frontend/framegraph-components/qlayerfilter.cpp b/src/render/frontend/framegraph-components/qlayerfilter.cpp index b15147f28..1dad3c1db 100644 --- a/src/render/frontend/framegraph-components/qlayerfilter.cpp +++ b/src/render/frontend/framegraph-components/qlayerfilter.cpp @@ -40,10 +40,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QLayerFilterPrivate + \class Qt3DRender::QLayerFilterPrivate \internal */ QLayerFilterPrivate::QLayerFilterPrivate() @@ -60,14 +60,14 @@ QLayerFilterPrivate::QLayerFilterPrivate() /*! \qmltype LayerFilter - \instantiates Qt3D::QLayerFilter + \instantiates Qt3DRender::QLayerFilter \inherits FrameGraphNode \inqmlmodule Qt3D.Renderer \since 5.5 \brief For ... */ -/*! \fn void Qt3D::QLayerFilter::copy(const QNode *ref) +/*! \fn void Qt3DRender::QLayerFilter::copy(const QNode *ref) Copies the \a ref instance into this one. */ void QLayerFilter::copy(const QNode *ref) @@ -78,7 +78,7 @@ void QLayerFilter::copy(const QNode *ref) } -/*! \fn Qt3D::QLayerFilter::QLayerFilter(QNode *parent) +/*! \fn Qt3DRender::QLayerFilter::QLayerFilter(QNode *parent) Constructs a new QLayerFilter with the specified \a parent. */ QLayerFilter::QLayerFilter(QNode *parent) @@ -98,7 +98,7 @@ QLayerFilter::QLayerFilter(QLayerFilterPrivate &dd, QNode *parent) } /*! - \property Qt3D::QLayerFilter::layers + \property Qt3DRender::QLayerFilter::layers */ @@ -123,6 +123,6 @@ QStringList QLayerFilter::layers() const } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qlayerfilter.h b/src/render/frontend/framegraph-components/qlayerfilter.h index 83b97b1e0..7e177e322 100644 --- a/src/render/frontend/framegraph-components/qlayerfilter.h +++ b/src/render/frontend/framegraph-components/qlayerfilter.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QLAYERFILTER_H -#define QT3D_QLAYERFILTER_H +#ifndef QT3DRENDER_QLAYERFILTER_H +#define QT3DRENDER_QLAYERFILTER_H #include <Qt3DRenderer/qframegraphnode.h> #include <QStringList> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QLayerFilterPrivate; @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QLayerFilter : public QFrameGraphNode Q_OBJECT Q_PROPERTY(QStringList layers READ layers WRITE setLayers NOTIFY layersChanged) public: - explicit QLayerFilter(QNode *parent = 0); + explicit QLayerFilter(Qt3D::QNode *parent = 0); ~QLayerFilter(); void setLayers(const QStringList &layers); @@ -61,16 +61,16 @@ Q_SIGNALS: void layersChanged(); protected: - QLayerFilter(QLayerFilterPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QLayerFilter(QLayerFilterPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QLayerFilter) QT3D_CLONEABLE(QLayerFilter) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QLAYERFILTER_H +#endif // QT3DRENDER_QLAYERFILTER_H diff --git a/src/render/frontend/framegraph-components/qlayerfilter_p.h b/src/render/frontend/framegraph-components/qlayerfilter_p.h index d998652e4..e1abb7cf8 100644 --- a/src/render/frontend/framegraph-components/qlayerfilter_p.h +++ b/src/render/frontend/framegraph-components/qlayerfilter_p.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QLAYERFILTER_P_H -#define QT3D_QLAYERFILTER_P_H +#ifndef QT3DRENDER_QLAYERFILTER_P_H +#define QT3DRENDER_QLAYERFILTER_P_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QLayerFilter; @@ -55,8 +55,8 @@ public: QStringList m_layers; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QLAYERFILTER_P_H +#endif // QT3DRENDER_QLAYERFILTER_P_H diff --git a/src/render/frontend/framegraph-components/qnodraw.cpp b/src/render/frontend/framegraph-components/qnodraw.cpp index ed695145d..294bdba5f 100644 --- a/src/render/frontend/framegraph-components/qnodraw.cpp +++ b/src/render/frontend/framegraph-components/qnodraw.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! * \class Qt3D::QNoDraw::QNoDraw @@ -48,8 +48,8 @@ namespace Qt3D { * * Qt3D::QNoDraw should be used when the FrameGraph needs to set up some render * states or clear some buffers without requiring any mesh to be drawn. It has - * the same effect as having a Qt3D::QRenderPassFilter that matches none of - * available Qt3D::QRenderPass instances of the scene without the overhead cost + * the same effect as having a Qt3DRender::QRenderPassFilter that matches none of + * available Qt3DRender::QRenderPass instances of the scene without the overhead cost * of actually performing the filtering. * * \since 5.5 @@ -65,6 +65,6 @@ QNoDraw::~QNoDraw() QNode::cleanup(); } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qnodraw.h b/src/render/frontend/framegraph-components/qnodraw.h index 99174573b..361bbfdc4 100644 --- a/src/render/frontend/framegraph-components/qnodraw.h +++ b/src/render/frontend/framegraph-components/qnodraw.h @@ -34,28 +34,28 @@ ** ****************************************************************************/ -#ifndef QT3D_QNODRAW_H -#define QT3D_QNODRAW_H +#ifndef QT3DRENDER_QNODRAW_H +#define QT3DRENDER_QNODRAW_H #include <Qt3DRenderer/qframegraphnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QT3DRENDERERSHARED_EXPORT QNoDraw : public QFrameGraphNode { Q_OBJECT public: - explicit QNoDraw(QNode *parent = 0); + explicit QNoDraw(Qt3D::QNode *parent = 0); ~QNoDraw(); private: QT3D_CLONEABLE(QNoDraw) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QNODRAW_H +#endif // QT3DRENDER_QNODRAW_H diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp index a0c845b00..bc72ed652 100644 --- a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp +++ b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp @@ -43,10 +43,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! - \class Qt3D::QRenderPassFilterPrivate + \class Qt3DRender::QRenderPassFilterPrivate \internal */ @@ -154,6 +156,6 @@ QList<QParameter *> QRenderPassFilter::parameters() const return d->m_parameters; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.h b/src/render/frontend/framegraph-components/qrenderpassfilter.h index e0f71a78b..edab54406 100644 --- a/src/render/frontend/framegraph-components/qrenderpassfilter.h +++ b/src/render/frontend/framegraph-components/qrenderpassfilter.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERPASSFILTER_H -#define QT3D_QRENDERPASSFILTER_H +#ifndef QT3DRENDER_QRENDERPASSFILTER_H +#define QT3DRENDER_QRENDERPASSFILTER_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/qframegraphnode.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderPassFilterPrivate; class QAnnotation; @@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QRenderPassFilter : public QFrameGraphNode Q_OBJECT public: - explicit QRenderPassFilter(QNode *parent = 0); + explicit QRenderPassFilter(Qt3D::QNode *parent = 0); ~QRenderPassFilter(); QList<QAnnotation *> includes() const; @@ -67,16 +67,16 @@ public: QList<QParameter *> parameters() const; protected: - QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QRenderPassFilter(QRenderPassFilterPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderPassFilter) QT3D_CLONEABLE(QRenderPassFilter) }; -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QRENDERPASSFILTER_H +#endif // QT3DRENDER_QRENDERPASSFILTER_H diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter_p.h b/src/render/frontend/framegraph-components/qrenderpassfilter_p.h index a849bf0c2..a1f3a4afa 100644 --- a/src/render/frontend/framegraph-components/qrenderpassfilter_p.h +++ b/src/render/frontend/framegraph-components/qrenderpassfilter_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERPASSFILTER_P_H -#define QT3D_QRENDERPASSFILTER_P_H +#ifndef QT3DRENDER_QRENDERPASSFILTER_P_H +#define QT3DRENDER_QRENDERPASSFILTER_P_H #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderPassFilter; @@ -58,8 +58,8 @@ public: QList<QParameter *> m_parameters; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QRENDERPASSFILTER_P_H +#endif // QT3DRENDER_QRENDERPASSFILTER_P_H diff --git a/src/render/frontend/framegraph-components/qrendertargetselector.cpp b/src/render/frontend/framegraph-components/qrendertargetselector.cpp index 069252766..fc87cadc9 100644 --- a/src/render/frontend/framegraph-components/qrendertargetselector.cpp +++ b/src/render/frontend/framegraph-components/qrendertargetselector.cpp @@ -42,10 +42,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! - \class Qt3D::QRenderTargetSelectorPrivate + \class Qt3DRender::QRenderTargetSelectorPrivate \internal */ QRenderTargetSelectorPrivate::QRenderTargetSelectorPrivate() @@ -96,9 +98,9 @@ QRenderTarget *QRenderTargetSelector::target() const /*! * \internal * Sets the draw buffers \a buffers to be used. The draw buffers should be - * matching the Qt3D::QRenderAttachment::RenderAttachmentType - * defined in the attachments of the Qt3D::QRenderTarget associated to the - * Qt3D::QRenderTargetSelector instance. + * matching the Qt3DRender::QRenderAttachment::RenderAttachmentType + * defined in the attachments of the Qt3DRender::QRenderTarget associated to the + * Qt3DRender::QRenderTargetSelector instance. * * \note At render time, if no draw buffer has been specified, the renderer will * default to using all the attachments' draw buffers. @@ -120,7 +122,7 @@ void QRenderTargetSelector::setDrawBuffers(const QList<QRenderAttachment::Render } /*! - * Returns the list of draw buffers for the current Qt3D::QRenderTargetSelector instance. + * Returns the list of draw buffers for the current Qt3DRender::QRenderTargetSelector instance. */ QList<QRenderAttachment::RenderAttachmentType> QRenderTargetSelector::drawBuffers() const { @@ -133,6 +135,6 @@ QRenderTargetSelector::QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Q { } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qrendertargetselector.h b/src/render/frontend/framegraph-components/qrendertargetselector.h index 33529d4d9..c05f4584f 100644 --- a/src/render/frontend/framegraph-components/qrendertargetselector.h +++ b/src/render/frontend/framegraph-components/qrendertargetselector.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERTARGETSELECTOR_H -#define QT3D_QRENDERTARGETSELECTOR_H +#ifndef QT3DRENDER_QRENDERTARGETSELECTOR_H +#define QT3DRENDER_QRENDERTARGETSELECTOR_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DCore/qnode.h> @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderTargetSelectorPrivate; class QRenderTarget; @@ -52,9 +52,9 @@ class QRenderTarget; class QT3DRENDERERSHARED_EXPORT QRenderTargetSelector : public QFrameGraphNode { Q_OBJECT - Q_PROPERTY(Qt3D::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged) + Q_PROPERTY(Qt3DRender::QRenderTarget *target READ target WRITE setTarget NOTIFY targetChanged) public: - explicit QRenderTargetSelector(QNode *parent = 0); + explicit QRenderTargetSelector(Qt3D::QNode *parent = 0); ~QRenderTargetSelector(); void setTarget(QRenderTarget *target); @@ -67,18 +67,18 @@ Q_SIGNALS: void targetChanged(); protected: - QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QRenderTargetSelector) QT3D_CLONEABLE(QRenderTargetSelector) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -Q_DECLARE_METATYPE(QList<Qt3D::QRenderAttachment::RenderAttachmentType>) +Q_DECLARE_METATYPE(QList<Qt3DRender::QRenderAttachment::RenderAttachmentType>) -#endif // QT3D_QRENDERTARGETSELECTOR_H +#endif // QT3DRENDER_QRENDERTARGETSELECTOR_H diff --git a/src/render/frontend/framegraph-components/qrendertargetselector_p.h b/src/render/frontend/framegraph-components/qrendertargetselector_p.h index 10a27ee3a..fa4d4aff2 100644 --- a/src/render/frontend/framegraph-components/qrendertargetselector_p.h +++ b/src/render/frontend/framegraph-components/qrendertargetselector_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QRENDERTARGETSELECTOR_P_H -#define QT3D_QRENDERTARGETSELECTOR_P_H +#ifndef QT3DRENDER_QRENDERTARGETSELECTOR_P_H +#define QT3DRENDER_QRENDERTARGETSELECTOR_P_H #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QRenderTargetSelector; class QRenderTarget; @@ -56,8 +56,8 @@ public: QList<QRenderAttachment::RenderAttachmentType> m_drawBuffers; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QRENDERTARGETSELECTOR_P_H +#endif // QT3DRENDER_QRENDERTARGETSELECTOR_P_H diff --git a/src/render/frontend/framegraph-components/qsortcriterion.cpp b/src/render/frontend/framegraph-components/qsortcriterion.cpp index a85608df9..2c09a552c 100644 --- a/src/render/frontend/framegraph-components/qsortcriterion.cpp +++ b/src/render/frontend/framegraph-components/qsortcriterion.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! \class Qt3D::QSortCriterionPrivate @@ -91,6 +91,6 @@ QSortCriterion::QSortCriterion(QSortCriterionPrivate &dd, QNode *parent) { } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qsortcriterion.h b/src/render/frontend/framegraph-components/qsortcriterion.h index 81371aa7e..d4e12a7a8 100644 --- a/src/render/frontend/framegraph-components/qsortcriterion.h +++ b/src/render/frontend/framegraph-components/qsortcriterion.h @@ -34,24 +34,24 @@ ** ****************************************************************************/ -#ifndef QT3D_QSORTCRITERION_H -#define QT3D_QSORTCRITERION_H +#ifndef QT3DRENDER_QSORTCRITERION_H +#define QT3DRENDER_QSORTCRITERION_H #include <Qt3DCore/qnode.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QSortCriterionPrivate; -class QT3DRENDERERSHARED_EXPORT QSortCriterion : public QNode +class QT3DRENDERERSHARED_EXPORT QSortCriterion : public Qt3D::QNode { Q_OBJECT - Q_PROPERTY(Qt3D::QSortCriterion::SortType sort READ sort WRITE setSort NOTIFY sortChanged) + Q_PROPERTY(Qt3DRender::QSortCriterion::SortType sort READ sort WRITE setSort NOTIFY sortChanged) public: - explicit QSortCriterion(QNode *parent = 0); + explicit QSortCriterion(Qt3D::QNode *parent = 0); ~QSortCriterion(); enum SortType { @@ -68,15 +68,15 @@ Q_SIGNALS: void sortChanged(); protected: - QSortCriterion(QSortCriterionPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QSortCriterion(QSortCriterionPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: QT3D_CLONEABLE(QSortCriterion) Q_DECLARE_PRIVATE(QSortCriterion) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qsortcriterion_p.h b/src/render/frontend/framegraph-components/qsortcriterion_p.h index 7e75c9a59..d4701aa24 100644 --- a/src/render/frontend/framegraph-components/qsortcriterion_p.h +++ b/src/render/frontend/framegraph-components/qsortcriterion_p.h @@ -34,17 +34,17 @@ ** ****************************************************************************/ -#ifndef QT3D_QSORTCRITERION_P_H -#define QT3D_QSORTCRITERION_P_H +#ifndef QT3DRENDER_QSORTCRITERION_P_H +#define QT3DRENDER_QSORTCRITERION_P_H #include <private/qnode_p.h> #include <Qt3DRenderer/qsortcriterion.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { -class QSortCriterionPrivate : public QNodePrivate +class QSortCriterionPrivate : public Qt3D::QNodePrivate { public: QSortCriterionPrivate(); @@ -53,8 +53,8 @@ public: QSortCriterion::SortType m_sort; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSORTCRITERION_P_H +#endif // QT3DRENDER_QSORTCRITERION_P_H diff --git a/src/render/frontend/framegraph-components/qsortmethod.cpp b/src/render/frontend/framegraph-components/qsortmethod.cpp index 824c8d198..c103fbe47 100644 --- a/src/render/frontend/framegraph-components/qsortmethod.cpp +++ b/src/render/frontend/framegraph-components/qsortmethod.cpp @@ -42,7 +42,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! \class Qt3D::QSortMethodPrivate @@ -113,6 +115,6 @@ QList<QSortCriterion *> QSortMethod::criteria() const return d->m_criteria; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qsortmethod.h b/src/render/frontend/framegraph-components/qsortmethod.h index c0f17fdd4..5eb5ee85e 100644 --- a/src/render/frontend/framegraph-components/qsortmethod.h +++ b/src/render/frontend/framegraph-components/qsortmethod.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSORTMETHOD_H -#define QT3D_QSORTMETHOD_H +#ifndef QT3DRENDER_QSORTMETHOD_H +#define QT3DRENDER_QSORTMETHOD_H #include <Qt3DRenderer/qframegraphnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QSortCriterion; class QSortMethodPrivate; @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QSortMethod : public QFrameGraphNode Q_OBJECT public: - explicit QSortMethod(QNode *parent = 0); + explicit QSortMethod(Qt3D::QNode *parent = 0); ~QSortMethod(); void addCriterion(QSortCriterion *criterion); @@ -59,16 +59,16 @@ public: QList<QSortCriterion *> criteria() const; protected: - QSortMethod(QSortMethodPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QSortMethod(QSortMethodPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QSortMethod) QT3D_CLONEABLE(QSortMethod) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSORTMETHOD_H +#endif // QT3DRENDER_QSORTMETHOD_H diff --git a/src/render/frontend/framegraph-components/qsortmethod_p.h b/src/render/frontend/framegraph-components/qsortmethod_p.h index 4ee604463..5cc7944ea 100644 --- a/src/render/frontend/framegraph-components/qsortmethod_p.h +++ b/src/render/frontend/framegraph-components/qsortmethod_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSORTMETHOD_P_H -#define QT3D_QSORTMETHOD_P_H +#ifndef QT3DRENDER_QSORTMETHOD_P_H +#define QT3DRENDER_QSORTMETHOD_P_H #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QSortMethod; class QSortCriterion; @@ -54,8 +54,8 @@ public: QList<QSortCriterion *> m_criteria; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSORTMETHOD_P_H +#endif // QT3DRENDER_QSORTMETHOD_P_H diff --git a/src/render/frontend/framegraph-components/qstateset.cpp b/src/render/frontend/framegraph-components/qstateset.cpp index aad72596c..cd7646d7b 100644 --- a/src/render/frontend/framegraph-components/qstateset.cpp +++ b/src/render/frontend/framegraph-components/qstateset.cpp @@ -42,7 +42,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { QStateSetPrivate::QStateSetPrivate() : QFrameGraphNodePrivate() @@ -58,14 +60,14 @@ QStateSetPrivate::QStateSetPrivate() * branch. * * States set on a Qt3D::QStateSet are set globally, contrary to the per - * Material states that can be set on a Qt3D::QRenderPass. By default an empty + * Material states that can be set on a Qt3DRender::QRenderPass. By default an empty * Qt3D::QStateSet will result in all render states being disabled when * executed. Adding a Qt3D::QRenderState state explicitly enables that render * state at runtime. * * \since 5.5 * - * \sa Qt3D::QRenderState, Qt3D::QRenderPass + * \sa Qt3D::QRenderState, Qt3DRender::QRenderPass */ QStateSet::QStateSet(QNode *parent) @@ -141,6 +143,6 @@ QList<QRenderState *> QStateSet::renderStates() const return d->m_renderStates; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qstateset.h b/src/render/frontend/framegraph-components/qstateset.h index 24c8609ed..c9d6eb68d 100644 --- a/src/render/frontend/framegraph-components/qstateset.h +++ b/src/render/frontend/framegraph-components/qstateset.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSTATESET_H -#define QT3D_QSTATESET_H +#ifndef QT3DRENDER_QSTATESET_H +#define QT3DRENDER_QSTATESET_H #include <Qt3DRenderer/qframegraphnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QStateSetPrivate; class QRenderState; @@ -51,7 +51,7 @@ class QT3DRENDERERSHARED_EXPORT QStateSet : public QFrameGraphNode Q_OBJECT public: - explicit QStateSet(QNode *parent = 0); + explicit QStateSet(Qt3D::QNode *parent = 0); ~QStateSet(); void addRenderState(QRenderState *state); @@ -59,16 +59,16 @@ public: QList<QRenderState *> renderStates() const; protected: - QStateSet(QStateSetPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QStateSet(QStateSetPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QStateSet) QT3D_CLONEABLE(QStateSet) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSTATESET_H +#endif // QT3DRENDER_QSTATESET_H diff --git a/src/render/frontend/framegraph-components/qstateset_p.h b/src/render/frontend/framegraph-components/qstateset_p.h index 290578bec..69e743fd0 100644 --- a/src/render/frontend/framegraph-components/qstateset_p.h +++ b/src/render/frontend/framegraph-components/qstateset_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QSTATESET_P_H -#define QT3D_QSTATESET_P_H +#ifndef QT3DRENDER_QSTATESET_P_H +#define QT3DRENDER_QSTATESET_P_H #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QStateSet; class QRenderState; @@ -55,9 +55,9 @@ public: QList<QRenderState *> m_renderStates; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QSTATESET_P_H +#endif // QT3DRENDER_QSTATESET_P_H diff --git a/src/render/frontend/framegraph-components/qtechniquefilter.cpp b/src/render/frontend/framegraph-components/qtechniquefilter.cpp index 1a1efc553..6092fb870 100644 --- a/src/render/frontend/framegraph-components/qtechniquefilter.cpp +++ b/src/render/frontend/framegraph-components/qtechniquefilter.cpp @@ -43,10 +43,12 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { /*! - \class Qt3D::QTechniqueFilterPrivate + \class Qt3DRender::QTechniqueFilterPrivate \internal */ QTechniqueFilterPrivate::QTechniqueFilterPrivate() @@ -158,6 +160,6 @@ QList<QParameter *> QTechniqueFilter::parameters() const return d->m_parameters; } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qtechniquefilter.h b/src/render/frontend/framegraph-components/qtechniquefilter.h index eae99d231..8b8a115f8 100644 --- a/src/render/frontend/framegraph-components/qtechniquefilter.h +++ b/src/render/frontend/framegraph-components/qtechniquefilter.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QTECHNIQUEFILTER_H -#define QT3D_QTECHNIQUEFILTER_H +#ifndef QT3DRENDER_QTECHNIQUEFILTER_H +#define QT3DRENDER_QTECHNIQUEFILTER_H #include <Qt3DRenderer/qt3drenderer_global.h> #include <Qt3DRenderer/qframegraphnode.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QTechniqueFilterPrivate; class QAnnotation; @@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QTechniqueFilter : public QFrameGraphNode { Q_OBJECT public: - explicit QTechniqueFilter(QNode *parent = 0); + explicit QTechniqueFilter(Qt3D::QNode *parent = 0); ~QTechniqueFilter(); QList<QAnnotation *> criteria() const; @@ -64,16 +64,16 @@ public: QList<QParameter *> parameters() const; protected: - QTechniqueFilter(QTechniqueFilterPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QTechniqueFilter(QTechniqueFilterPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QTechniqueFilter) QT3D_CLONEABLE(QTechniqueFilter) }; -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QTECHNIQUEFILTER_H +#endif // QT3DRENDER_QTECHNIQUEFILTER_H diff --git a/src/render/frontend/framegraph-components/qtechniquefilter_p.h b/src/render/frontend/framegraph-components/qtechniquefilter_p.h index 1b87f4e12..219e50b9a 100644 --- a/src/render/frontend/framegraph-components/qtechniquefilter_p.h +++ b/src/render/frontend/framegraph-components/qtechniquefilter_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QTECHNIQUEFILTER_P_H -#define QT3D_QTECHNIQUEFILTER_P_H +#ifndef QT3DRENDER_QTECHNIQUEFILTER_P_H +#define QT3DRENDER_QTECHNIQUEFILTER_P_H #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QTechniqueFilter; @@ -55,8 +55,8 @@ public : QList<QParameter *> m_parameters; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QTECHNIQUEFILTER_P_H +#endif // QT3DRENDER_QTECHNIQUEFILTER_P_H diff --git a/src/render/frontend/framegraph-components/qviewport.cpp b/src/render/frontend/framegraph-components/qviewport.cpp index 6197dcd52..4f821b58f 100644 --- a/src/render/frontend/framegraph-components/qviewport.cpp +++ b/src/render/frontend/framegraph-components/qviewport.cpp @@ -41,10 +41,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { /*! - \class Qt3D::QViewportPrivate + \class Qt3DRender::QViewportPrivate \internal */ QViewportPrivate::QViewportPrivate() @@ -106,6 +106,6 @@ void QViewport::setClearColor(const QColor &color) } } -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE diff --git a/src/render/frontend/framegraph-components/qviewport.h b/src/render/frontend/framegraph-components/qviewport.h index 7390e85ae..3f427d044 100644 --- a/src/render/frontend/framegraph-components/qviewport.h +++ b/src/render/frontend/framegraph-components/qviewport.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QVIEWPORT_H -#define QT3D_QVIEWPORT_H +#ifndef QT3DRENDER_QVIEWPORT_H +#define QT3DRENDER_QVIEWPORT_H #include <Qt3DRenderer/qframegraphnode.h> #include <QRectF> @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QViewportPrivate; @@ -54,7 +54,7 @@ class QT3DRENDERERSHARED_EXPORT QViewport : public QFrameGraphNode Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged) public: - explicit QViewport(QNode *parent = 0); + explicit QViewport(Qt3D::QNode *parent = 0); ~QViewport(); QRectF rect() const; @@ -68,16 +68,16 @@ Q_SIGNALS: void clearColorChanged(); protected: - QViewport(QViewportPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QViewport(QViewportPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QViewport) QT3D_CLONEABLE(QViewport) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QVIEWPORT_H +#endif // QT3DRENDER_QVIEWPORT_H diff --git a/src/render/frontend/framegraph-components/qviewport_p.h b/src/render/frontend/framegraph-components/qviewport_p.h index 4e42887d7..bb1cd1a26 100644 --- a/src/render/frontend/framegraph-components/qviewport_p.h +++ b/src/render/frontend/framegraph-components/qviewport_p.h @@ -34,14 +34,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QVIEWPORT_P_H -#define QT3D_QVIEWPORT_P_H +#ifndef QT3DRENDER_QVIEWPORT_P_H +#define QT3DRENDER_QVIEWPORT_P_H #include <private/qframegraphnode_p.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QViewport; @@ -55,8 +55,8 @@ public : QColor m_clearColor; }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QVIEWPORT_P_H +#endif // QT3DRENDER_QVIEWPORT_P_H |