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 /examples/qt3d/materials-cpp/renderableentity.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 'examples/qt3d/materials-cpp/renderableentity.cpp')
-rw-r--r-- | examples/qt3d/materials-cpp/renderableentity.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/examples/qt3d/materials-cpp/renderableentity.cpp b/examples/qt3d/materials-cpp/renderableentity.cpp index 2e463a607..1d100c686 100644 --- a/examples/qt3d/materials-cpp/renderableentity.cpp +++ b/examples/qt3d/materials-cpp/renderableentity.cpp @@ -36,13 +36,13 @@ #include "renderableentity.h" -RenderableEntity::RenderableEntity(Qt3D::QNode *parent) - : Qt3D::QEntity(parent) +RenderableEntity::RenderableEntity(Qt3DCore::QNode *parent) + : Qt3DCore::QEntity(parent) , m_mesh(new Qt3DRender::QMesh()) - , m_transform(new Qt3D::QTransform()) - , m_rotateTransform(new Qt3D::QRotateTransform()) - , m_scaleTransform(new Qt3D::QScaleTransform()) - , m_translateTransform(new Qt3D::QTranslateTransform()) + , m_transform(new Qt3DCore::QTransform()) + , m_rotateTransform(new Qt3DCore::QRotateTransform()) + , m_scaleTransform(new Qt3DCore::QScaleTransform()) + , m_translateTransform(new Qt3DCore::QTranslateTransform()) { m_transform->addTransform(m_rotateTransform); m_transform->addTransform(m_scaleTransform); @@ -61,17 +61,17 @@ Qt3DRender::QMesh *RenderableEntity::mesh() const return m_mesh; } -Qt3D::QScaleTransform *RenderableEntity::scaleTransform() const +Qt3DCore::QScaleTransform *RenderableEntity::scaleTransform() const { return m_scaleTransform; } -Qt3D::QTranslateTransform *RenderableEntity::translateTransform() const +Qt3DCore::QTranslateTransform *RenderableEntity::translateTransform() const { return m_translateTransform; } -Qt3D::QRotateTransform *RenderableEntity::rotateTransform() const +Qt3DCore::QRotateTransform *RenderableEntity::rotateTransform() const { return m_rotateTransform; } |