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/jobs/loadtexturedatajob_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/jobs/loadtexturedatajob_p.h')
-rw-r--r-- | src/render/backend/jobs/loadtexturedatajob_p.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/render/backend/jobs/loadtexturedatajob_p.h b/src/render/backend/jobs/loadtexturedatajob_p.h index 7e3af054b..15b32c79b 100644 --- a/src/render/backend/jobs/loadtexturedatajob_p.h +++ b/src/render/backend/jobs/loadtexturedatajob_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_LOADTEXTUREDATAJOB_H -#define QT3D_RENDER_LOADTEXTUREDATAJOB_H +#ifndef QT3DRENDER_RENDER_LOADTEXTUREDATAJOB_H +#define QT3DRENDER_RENDER_LOADTEXTUREDATAJOB_H #include <Qt3DCore/qnodeid.h> #include <Qt3DCore/qaspectjob.h> @@ -43,16 +43,16 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class Renderer; -class LoadTextureDataJob : public QAspectJob +class LoadTextureDataJob : public Qt3D::QAspectJob { public: - LoadTextureDataJob(const QNodeId &textureId); + LoadTextureDataJob(const Qt3D::QNodeId &textureId); ~LoadTextureDataJob(); inline void setRenderer(Renderer *renderer) { m_renderer = renderer; } @@ -60,16 +60,16 @@ protected: void run() Q_DECL_FINAL; private: - QNodeId m_textureId; + Qt3D::QNodeId m_textureId; Renderer *m_renderer; }; typedef QSharedPointer<LoadTextureDataJob> LoadTextureDataJobPtr; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_LOADTEXTUREDATAJOB_H +#endif // QT3DRENDER_RENDER_LOADTEXTUREDATAJOB_H |