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/io/uniformbuffer_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/io/uniformbuffer_p.h')
| -rw-r--r-- | src/render/io/uniformbuffer_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/render/io/uniformbuffer_p.h b/src/render/io/uniformbuffer_p.h index b759dd364..6d489c248 100644 --- a/src/render/io/uniformbuffer_p.h +++ b/src/render/io/uniformbuffer_p.h @@ -34,21 +34,21 @@ ** ****************************************************************************/ -#ifndef QT3D_RENDER_UNIFORMBUFFER_P_H -#define QT3D_RENDER_UNIFORMBUFFER_P_H +#ifndef QT3DRENDER_RENDER_UNIFORMBUFFER_P_H +#define QT3DRENDER_RENDER_UNIFORMBUFFER_P_H #include <QOpenGLContext> #include <Qt3DCore/qnodeid.h> QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { namespace Render { class QGraphicsContext; -typedef QPair<QNodeId, QNodeId> ShaderDataShaderUboKey; +typedef QPair<Qt3D::QNodeId, Qt3D::QNodeId> ShaderDataShaderUboKey; class UniformBuffer { @@ -70,10 +70,10 @@ private: bool m_isCreated; }; -} // Render +} // namespace Render -} // Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE -#endif // QT3D_RENDER_UNIFORMBUFFER_P_H +#endif // QT3DRENDER_RENDER_UNIFORMBUFFER_P_H |