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/qblendstate.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/qblendstate.h')
-rw-r--r-- | src/render/frontend/qblendstate.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/render/frontend/qblendstate.h b/src/render/frontend/qblendstate.h index 7f3901f22..25072f449 100644 --- a/src/render/frontend/qblendstate.h +++ b/src/render/frontend/qblendstate.h @@ -35,14 +35,14 @@ ** ****************************************************************************/ -#ifndef QT3D_QBLENDSTATE_H -#define QT3D_QBLENDSTATE_H +#ifndef QT3DRENDER_QBLENDSTATE_H +#define QT3DRENDER_QBLENDSTATE_H #include <Qt3DRenderer/qrenderstate.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QBlendStatePrivate; @@ -80,7 +80,7 @@ public: }; Q_ENUM(Blending) - explicit QBlendState(QNode *parent = 0); + explicit QBlendState(Qt3D::QNode *parent = 0); ~QBlendState(); Blending srcRGB() const; @@ -102,8 +102,8 @@ Q_SIGNALS: void dstAlphaChanged(); protected: - void copy(const QNode *ref) Q_DECL_OVERRIDE; - QBlendState(QRenderState::Type type, QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QBlendState(QRenderState::Type type, Qt3D::QNode *parent = 0); private: Q_DECLARE_PRIVATE(QBlendState) @@ -114,11 +114,11 @@ class QT3DRENDERERSHARED_EXPORT QBlendStateSeparate : public QBlendState { Q_OBJECT public: - explicit QBlendStateSeparate(QNode *parent = 0); + explicit QBlendStateSeparate(Qt3D::QNode *parent = 0); }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QBLENDSTATE_H +#endif // QT3DRENDER_QBLENDSTATE_H |