summaryrefslogtreecommitdiffstats
path: root/src/render/io/scenemanager_p.h
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-10-12 20:45:19 +0100
committerPaul Lemire <paul.lemire@kdab.com>2015-10-13 13:19:50 +0000
commit7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 (patch)
tree53197a9e5eb7501d6f5b497f70c25dad9c265a6f /src/render/io/scenemanager_p.h
parent0bfd20ad3b8eb3edec8d6317af9eb5504f8c0871 (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/io/scenemanager_p.h')
-rw-r--r--src/render/io/scenemanager_p.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/render/io/scenemanager_p.h b/src/render/io/scenemanager_p.h
index 7bb845998..7baccd006 100644
--- a/src/render/io/scenemanager_p.h
+++ b/src/render/io/scenemanager_p.h
@@ -55,30 +55,30 @@
QT_BEGIN_NAMESPACE
-namespace Qt3D {
+namespace Qt3DCore {
class QEntity;
}
namespace Qt3DRender {
namespace Render {
-class SceneManager : public Qt3D::QResourceManager<Scene,
- Qt3D::QNodeId,
+class SceneManager : public Qt3DCore::QResourceManager<Scene,
+ Qt3DCore::QNodeId,
8,
- Qt3D::ArrayAllocatingPolicy,
- Qt3D::ObjectLevelLockingPolicy>
+ Qt3DCore::ArrayAllocatingPolicy,
+ Qt3DCore::ObjectLevelLockingPolicy>
{
public:
SceneManager();
- void addSceneData(const QUrl &source, const Qt3D::QNodeId &sceneUuid);
+ void addSceneData(const QUrl &source, const Qt3DCore::QNodeId &sceneUuid);
QVector<LoadSceneJobPtr> pendingSceneLoaderJobs();
- void addLoadedSceneTree(const QUrl &source, Qt3D::QEntity *tree);
- Qt3D::QEntity *sceneTreeFromSource(const QUrl &source);
+ void addLoadedSceneTree(const QUrl &source, Qt3DCore::QEntity *tree);
+ Qt3DCore::QEntity *sceneTreeFromSource(const QUrl &source);
private:
- QHash<QUrl, Qt3D::QEntity *> m_loadedSceneTrees;
+ QHash<QUrl, Qt3DCore::QEntity *> m_loadedSceneTrees;
QVector<LoadSceneJobPtr> m_pendingJobs;
};