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/backend/rendermaterial_p.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/backend/rendermaterial_p.h')
-rw-r--r-- | src/render/backend/rendermaterial_p.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/render/backend/rendermaterial_p.h b/src/render/backend/rendermaterial_p.h index 934441f90..862ff0ad2 100644 --- a/src/render/backend/rendermaterial_p.h +++ b/src/render/backend/rendermaterial_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_RENDERMATERIAL_H -#define QT3D_RENDER_RENDERMATERIAL_H +#ifndef QT3DRENDER_RENDER_RENDERMATERIAL_H +#define QT3DRENDER_RENDER_RENDERMATERIAL_H #include <QVariant> @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QMaterial; class QParameter; @@ -58,29 +58,29 @@ class RenderTechnique; class RenderEffect; class MaterialManager; -class Q_AUTOTEST_EXPORT RenderMaterial : public QBackendNode +class Q_AUTOTEST_EXPORT RenderMaterial : public Qt3D::QBackendNode { public: RenderMaterial(); ~RenderMaterial(); void cleanup(); - void updateFromPeer(QNode* mat) Q_DECL_OVERRIDE; - void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE; + void updateFromPeer(Qt3D::QNode* mat) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; inline bool isEnabled() const { return m_enabled; } - QList<QNodeId> parameters() const; - QNodeId effect() const; + QList<Qt3D::QNodeId> parameters() const; + Qt3D::QNodeId effect() const; private: ParameterPack m_parameterPack; - QNodeId m_effectUuid; + Qt3D::QNodeId m_effectUuid; bool m_enabled; }; -} // Render -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_RENDERMATERIAL_H +#endif // QT3DRENDER_RENDER_RENDERMATERIAL_H |