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/render/frontend/framegraph-components/qrendertargetselector.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/render/frontend/framegraph-components/qrendertargetselector.h')
-rw-r--r-- | src/render/frontend/framegraph-components/qrendertargetselector.h | 20 |
1 files changed, 10 insertions, 10 deletions
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 |