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/framegraph/framegraphnode_p.h | |
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/framegraph/framegraphnode_p.h')
-rw-r--r-- | src/render/framegraph/framegraphnode_p.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h index 35875bcab..b58cfdbff 100644 --- a/src/render/framegraph/framegraphnode_p.h +++ b/src/render/framegraph/framegraphnode_p.h @@ -62,7 +62,7 @@ namespace Qt3DRender { namespace Render { -class FrameGraphNode : public Qt3D::QBackendNode +class FrameGraphNode : public Qt3DCore::QBackendNode { public: FrameGraphNode(); @@ -116,7 +116,7 @@ private: }; template<typename Backend, typename Frontend> -class FrameGraphNodeFunctor : public Qt3D::QBackendNodeFunctor +class FrameGraphNodeFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit FrameGraphNodeFunctor(FrameGraphManager *manager) @@ -124,12 +124,12 @@ public: { } - Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE + Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE { return createBackendFrameGraphNode(frontend, factory); } - Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE + Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE { FrameGraphNode **node = m_manager->lookupResource(id); if (node != Q_NULLPTR) @@ -137,13 +137,13 @@ public: return Q_NULLPTR; } - void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE + void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE { m_manager->releaseResource(id); } protected: - Backend *createBackendFrameGraphNode(Qt3D::QNode *n, const Qt3D::QBackendNodeFactory *factory) const + Backend *createBackendFrameGraphNode(Qt3DCore::QNode *n, const Qt3DCore::QBackendNodeFactory *factory) const { Frontend *f = qobject_cast<Frontend *>(n); if (f != Q_NULLPTR) { @@ -170,13 +170,13 @@ private: FrameGraphManager *m_manager; }; -class FrameGraphComponentFunctor : public Qt3D::QBackendNodeFunctor +class FrameGraphComponentFunctor : public Qt3DCore::QBackendNodeFunctor { public: explicit FrameGraphComponentFunctor(Renderer *renderer); - Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; - Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; + void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; private: Renderer *m_renderer; |