From 7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Mon, 12 Oct 2015 20:45:19 +0100 Subject: Move Qt3DCore into Qt3DCore namespace Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire --- src/render/materialsystem/effect_p.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/render/materialsystem/effect_p.h') 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 techniques() const; - QList parameters() const; + QList techniques() const; + QList parameters() const; private: - QList m_techniques; + QList m_techniques; ParameterPack m_parameterPack; }; -- cgit v1.2.3