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/qabstractlight.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/qabstractlight.h')
| -rw-r--r-- | src/render/frontend/qabstractlight.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/render/frontend/qabstractlight.h b/src/render/frontend/qabstractlight.h index c5db0e67c..6f30fe955 100644 --- a/src/render/frontend/qabstractlight.h +++ b/src/render/frontend/qabstractlight.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTLIGHT_H -#define QT3D_QABSTRACTLIGHT_H +#ifndef QT3DRENDER_QABSTRACTLIGHT_H +#define QT3DRENDER_QABSTRACTLIGHT_H #include <Qt3DRenderer/qshaderdata.h> #include <Qt3DRenderer/qt3drenderer_global.h> @@ -45,8 +45,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D -{ +namespace Qt3DRender { class QAbstractLightPrivate; @@ -59,7 +58,7 @@ class QT3DRENDERERSHARED_EXPORT QAbstractLight : public QShaderData Q_PROPERTY(TransformType positionTransformed READ positionTransformed CONSTANT) public : - explicit QAbstractLight(QNode *parent = 0); + explicit QAbstractLight(Qt3D::QNode *parent = 0); QColor color() const; void setColor(const QColor &color); @@ -73,8 +72,8 @@ public : TransformType positionTransformed() const; protected : - QAbstractLight(QAbstractLightPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QAbstractLight(QAbstractLightPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; Q_SIGNALS: void colorChanged(); @@ -85,8 +84,8 @@ private: Q_DECLARE_PRIVATE(QAbstractLight) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_LIGHT_H +#endif // QT3DRENDER_LIGHT_H |