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/qshaderdata.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/qshaderdata.h')
-rw-r--r-- | src/render/frontend/qshaderdata.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/render/frontend/qshaderdata.h b/src/render/frontend/qshaderdata.h index 681c41439..4353581af 100644 --- a/src/render/frontend/qshaderdata.h +++ b/src/render/frontend/qshaderdata.h @@ -34,15 +34,15 @@ ** ****************************************************************************/ -#ifndef QT3D_QSHADERDATA_H -#define QT3D_QSHADERDATA_H +#ifndef QT3DRENDER_QSHADERDATA_H +#define QT3DRENDER_QSHADERDATA_H #include <Qt3DCore/qcomponent.h> #include <Qt3DRenderer/qt3drenderer_global.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { class QShaderDataPrivate; @@ -55,11 +55,11 @@ public: typedef QSharedPointer<PropertyReaderInterface> PropertyReaderInterfacePtr; -class QT3DRENDERERSHARED_EXPORT QShaderData : public QComponent +class QT3DRENDERERSHARED_EXPORT QShaderData : public Qt3D::QComponent { Q_OBJECT public: - explicit QShaderData(QNode *parent = 0); + explicit QShaderData(Qt3D::QNode *parent = 0); ~QShaderData(); enum TransformType { @@ -71,8 +71,8 @@ public: PropertyReaderInterfacePtr propertyReader() const; protected: - QShaderData(QShaderDataPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QShaderData(QShaderDataPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: @@ -80,11 +80,11 @@ private: QT3D_CLONEABLE(QShaderData) }; -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::QShaderData*) -Q_DECLARE_METATYPE(QList<Qt3D::QShaderData*>) +Q_DECLARE_METATYPE(Qt3DRender::QShaderData*) +Q_DECLARE_METATYPE(QList<Qt3DRender::QShaderData*>) -#endif // QT3D_QSHADERDATA_H +#endif // QT3DRENDER_QSHADERDATA_H |