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/materialsystem/effect_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/materialsystem/effect_p.h')
-rw-r--r-- | src/render/materialsystem/effect_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/render/materialsystem/effect_p.h b/src/render/materialsystem/effect_p.h index 841f2996a..0d307d0c5 100644 --- a/src/render/materialsystem/effect_p.h +++ b/src/render/materialsystem/effect_p.h @@ -62,22 +62,22 @@ class QTechnique; namespace Render { -class Effect : public Qt3D::QBackendNode +class Effect : public Qt3DCore::QBackendNode { public: Effect(); ~Effect(); void cleanup(); - void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE; - void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE; - void appendRenderTechnique(const Qt3D::QNodeId &t); + void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; + void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; + void appendRenderTechnique(const Qt3DCore::QNodeId &t); - QList<Qt3D::QNodeId> techniques() const; - QList<Qt3D::QNodeId> parameters() const; + QList<Qt3DCore::QNodeId> techniques() const; + QList<Qt3DCore::QNodeId> parameters() const; private: - QList<Qt3D::QNodeId> m_techniques; + QList<Qt3DCore::QNodeId> m_techniques; ParameterPack m_parameterPack; }; |