diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-08-31 15:14:17 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-13 07:15:15 +0000 |
commit | af40840eedf35404ba4b39e890c158e2328ff6ec (patch) | |
tree | ce4ac1f925c34b56704c99bd332e0436e68dbecc /src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h | |
parent | 0269afd106da5d4d999585b3bdb1332a2c01af12 (diff) |
Move Render aspect into the Qt3DRender namespace
Updated examples and tests accordingly.
Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h')
-rw-r--r-- | src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h b/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h index 4b22568ad..aefdd8e33 100644 --- a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h +++ b/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H -#define QT3D_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H +#ifndef QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H +#define QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H #include <Qt3DQuick/quick3dnode.h> #include <Qt3DRenderer/qrenderpassfilter.h> @@ -44,25 +44,23 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DRender { namespace Render { - namespace Quick { class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderPassFilter : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> includes READ includeList) - Q_PROPERTY(QQmlListProperty<Qt3D::QParameter> parameters READ parameterList) + Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> includes READ includeList) + Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ parameterList) public: explicit Quick3DRenderPassFilter(QObject *parent = 0); - QQmlListProperty<Qt3D::QAnnotation> includeList(); - QQmlListProperty<Qt3D::QParameter> parameterList(); + QQmlListProperty<QAnnotation> includeList(); + QQmlListProperty<QParameter> parameterList(); - inline QRenderPassFilter *parentRenderPassFilter() const { return qobject_cast<Qt3D::QRenderPassFilter*>(parent()); } + inline QRenderPassFilter *parentRenderPassFilter() const { return qobject_cast<Qt3DRender::QRenderPassFilter*>(parent()); } private: static void appendInclude(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion); @@ -76,12 +74,10 @@ private: static void clearParameterList(QQmlListProperty<QParameter> *list); }; -} // Quick - -} // Render - -} // Qt3D +} // namespace Quick +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H +#endif // QT3DRENDER_RENDER_QUICK_QUICK3DRENDERPASSFILTER_H |