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/qabstractsceneloader.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/qabstractsceneloader.h')
-rw-r--r-- | src/render/frontend/qabstractsceneloader.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/render/frontend/qabstractsceneloader.h b/src/render/frontend/qabstractsceneloader.h index 368eb4bc6..88af95577 100644 --- a/src/render/frontend/qabstractsceneloader.h +++ b/src/render/frontend/qabstractsceneloader.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_QABSTRACTSCENELOADER_H -#define QT3D_QABSTRACTSCENELOADER_H +#ifndef QT3DRENDER_QABSTRACTSCENELOADER_H +#define QT3DRENDER_QABSTRACTSCENELOADER_H #include <Qt3DCore/qcomponent.h> #include <Qt3DCore/qscenechange.h> @@ -44,19 +44,18 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { -namespace Render { +namespace Qt3DRender { class QAbstractSceneLoader; class QAbstractSceneLoaderPrivate; -class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoader : public QComponent +class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoader : public Qt3D::QComponent { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) public: - explicit QAbstractSceneLoader(QNode *parent = 0); + explicit QAbstractSceneLoader(Qt3D::QNode *parent = 0); ~QAbstractSceneLoader(); enum Status { @@ -77,17 +76,15 @@ Q_SIGNALS: void statusChanged(); protected: - QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, QNode *parent = 0); - void copy(const QNode *ref) Q_DECL_OVERRIDE; + QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, Qt3D::QNode *parent = 0); + void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QAbstractSceneLoader) }; -} // Render - -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_QABSTRACTSCENELOADER_H +#endif // QT3DRENDER_QABSTRACTSCENELOADER_H |