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/defaults/qdiffusemapmaterial.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/defaults/qdiffusemapmaterial.h')
| -rw-r--r-- | src/render/defaults/qdiffusemapmaterial.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h index 13a1dd6da..dbbdb21f1 100644 --- a/src/render/defaults/qdiffusemapmaterial.h +++ b/src/render/defaults/qdiffusemapmaterial.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_QDIFFUSEMAPMATERIAL_H -#define QT3D_RENDER_QDIFFUSEMAPMATERIAL_H +#ifndef QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H +#define QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H #include <Qt3DRenderer/qmaterial.h> #include <QColor> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QDiffuseMapMaterialPrivate; class QAbstractTextureProvider; @@ -57,7 +57,7 @@ class QT3DRENDERERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QDiffuseMapMaterial(QNode *parent = 0); + explicit QDiffuseMapMaterial(Qt3D::QNode *parent = 0); ~QDiffuseMapMaterial(); QColor ambient() const; @@ -83,8 +83,8 @@ private: Q_DECLARE_PRIVATE(QDiffuseMapMaterial) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_QDIFFUSEMAPMATERIAL_H +#endif // QT3DRENDER_RENDER_QDIFFUSEMAPMATERIAL_H |