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/qitemmodelbuffer.cpp | |
| 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/qitemmodelbuffer.cpp')
| -rw-r--r-- | src/render/frontend/qitemmodelbuffer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/render/frontend/qitemmodelbuffer.cpp b/src/render/frontend/qitemmodelbuffer.cpp index 540d341e0..f8437d1c9 100644 --- a/src/render/frontend/qitemmodelbuffer.cpp +++ b/src/render/frontend/qitemmodelbuffer.cpp @@ -41,7 +41,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; + +namespace Qt3DRender { void variantToBytes(void* dest, const QVariant& v, GLint type) { @@ -109,7 +111,7 @@ void variantToBytes(void* dest, const QVariant& v, GLint type) namespace { -QAbstractAttribute::DataType typeFromGLType(GLint dataType, uint &dataCount) +Qt3D::QAbstractAttribute::DataType typeFromGLType(GLint dataType, uint &dataCount) { switch (dataType) { @@ -347,6 +349,6 @@ QItemModelBuffer::RoleMapping::RoleMapping(QByteArray rnm, QString nm, int ty) : byteSize = Render::QGraphicsContext::byteSizeFromType(ty); } -} // namespace Qt3D +} // namespace Qt3DRender QT_END_NAMESPACE |