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 /tests/auto/render/meshfunctors/tst_meshfunctors.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 'tests/auto/render/meshfunctors/tst_meshfunctors.cpp')
-rw-r--r-- | tests/auto/render/meshfunctors/tst_meshfunctors.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp index a7d0f91a7..36a0f7316 100644 --- a/tests/auto/render/meshfunctors/tst_meshfunctors.cpp +++ b/tests/auto/render/meshfunctors/tst_meshfunctors.cpp @@ -38,7 +38,7 @@ #include <Qt3DRenderer/qgeometryfunctor.h> #include <Qt3DRenderer/qgeometry.h> -class MeshFunctorA : public Qt3D::QGeometryFunctor +class MeshFunctorA : public Qt3DRender::QGeometryFunctor { public: MeshFunctorA() @@ -47,12 +47,12 @@ public: ~MeshFunctorA() {} - Qt3D::QGeometry *operator ()() Q_DECL_OVERRIDE + Qt3DRender::QGeometry *operator ()() Q_DECL_OVERRIDE { return Q_NULLPTR; } - bool operator ==(const Qt3D::QGeometryFunctor &other) const Q_DECL_OVERRIDE + bool operator ==(const Qt3DRender::QGeometryFunctor &other) const Q_DECL_OVERRIDE { return functor_cast<MeshFunctorA>(&other); } @@ -60,7 +60,7 @@ public: QT3D_FUNCTOR(MeshFunctorA) }; -class MeshFunctorB : public Qt3D::QGeometryFunctor +class MeshFunctorB : public Qt3DRender::QGeometryFunctor { public: MeshFunctorB() @@ -69,12 +69,12 @@ public: ~MeshFunctorB() {} - Qt3D::QGeometry *operator ()() Q_DECL_OVERRIDE + Qt3DRender::QGeometry *operator ()() Q_DECL_OVERRIDE { return Q_NULLPTR; } - bool operator ==(const Qt3D::QGeometryFunctor &other) const Q_DECL_OVERRIDE + bool operator ==(const Qt3DRender::QGeometryFunctor &other) const Q_DECL_OVERRIDE { return functor_cast<MeshFunctorB>(&other); } @@ -91,7 +91,7 @@ public: ~MeshFunctorASub() {} - bool operator ==(const Qt3D::QGeometryFunctor &other) const Q_DECL_OVERRIDE + bool operator ==(const Qt3DRender::QGeometryFunctor &other) const Q_DECL_OVERRIDE { return functor_cast<MeshFunctorASub>(&other); } |