diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-10-12 20:45:19 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 13:19:50 +0000 |
| commit | 7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 (patch) | |
| tree | 53197a9e5eb7501d6f5b497f70c25dad9c265a6f /src/render/geometry/geometryrenderer.cpp | |
| parent | 0bfd20ad3b8eb3edec8d6317af9eb5504f8c0871 (diff) | |
Move Qt3DCore into Qt3DCore namespace
Update other aspects, tests and examples accordingly.
Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/geometry/geometryrenderer.cpp')
| -rw-r--r-- | src/render/geometry/geometryrenderer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp index 583a23d34..a70405ea8 100644 --- a/src/render/geometry/geometryrenderer.cpp +++ b/src/render/geometry/geometryrenderer.cpp @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -using namespace Qt3D; +using namespace Qt3DCore; namespace Qt3DRender { namespace Render { @@ -73,7 +73,7 @@ void GeometryRenderer::cleanup() m_restartIndex = -1; m_primitiveRestart = false; m_primitiveType = QGeometryRenderer::Triangles; - m_geometryId = Qt3D::QNodeId(); + m_geometryId = Qt3DCore::QNodeId(); m_dirty = false; m_functor.reset(); } @@ -83,7 +83,7 @@ void GeometryRenderer::setManager(GeometryRendererManager *manager) m_manager = manager; } -void GeometryRenderer::updateFromPeer(Qt3D::QNode *peer) +void GeometryRenderer::updateFromPeer(Qt3DCore::QNode *peer) { QGeometryRenderer *geometryRenderer = static_cast<QGeometryRenderer *>(peer); if (geometryRenderer) { @@ -103,7 +103,7 @@ void GeometryRenderer::updateFromPeer(Qt3D::QNode *peer) } } -void GeometryRenderer::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void GeometryRenderer::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); QByteArray propertyName = propertyChange->propertyName(); @@ -190,7 +190,7 @@ GeometryRendererFunctor::GeometryRendererFunctor(GeometryRendererManager *manage { } -Qt3D::QBackendNode *GeometryRendererFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const +Qt3DCore::QBackendNode *GeometryRendererFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const { GeometryRenderer *geometryRenderer = m_manager->getOrCreateResource(frontend->id()); geometryRenderer->setFactory(factory); @@ -199,12 +199,12 @@ Qt3D::QBackendNode *GeometryRendererFunctor::create(Qt3D::QNode *frontend, const return geometryRenderer; } -Qt3D::QBackendNode *GeometryRendererFunctor::get(const Qt3D::QNodeId &id) const +Qt3DCore::QBackendNode *GeometryRendererFunctor::get(const Qt3DCore::QNodeId &id) const { return m_manager->lookupResource(id); } -void GeometryRendererFunctor::destroy(const Qt3D::QNodeId &id) const +void GeometryRendererFunctor::destroy(const Qt3DCore::QNodeId &id) const { return m_manager->releaseResource(id); } |