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/backend/jobs/loadscenejob.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/backend/jobs/loadscenejob.cpp')
| -rw-r--r-- | src/render/backend/jobs/loadscenejob.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/render/backend/jobs/loadscenejob.cpp b/src/render/backend/jobs/loadscenejob.cpp index 169804e19..bae7afcc2 100644 --- a/src/render/backend/jobs/loadscenejob.cpp +++ b/src/render/backend/jobs/loadscenejob.cpp @@ -42,11 +42,10 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { - +namespace Qt3DRender { namespace Render { -LoadSceneJob::LoadSceneJob(const QUrl &source, const QNodeId &m_sceneComponent) +LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3D::QNodeId &m_sceneComponent) : QAspectJob() , m_renderer(Q_NULLPTR) , m_source(source) @@ -56,7 +55,7 @@ LoadSceneJob::LoadSceneJob(const QUrl &source, const QNodeId &m_sceneComponent) void LoadSceneJob::run() { - QEntity *sceneTree = m_renderer->sceneManager()->sceneTreeFromSource(m_source); + Qt3D::QEntity *sceneTree = m_renderer->sceneManager()->sceneTreeFromSource(m_source); if (sceneTree == Q_NULLPTR) { Q_FOREACH (AbstractSceneParser *parser, m_renderer->sceneParsers()) { if (parser->isExtensionSupported(m_source)) { @@ -71,8 +70,7 @@ void LoadSceneJob::run() scene->setSceneSubtree(sceneTree); } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE |