summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem/effect.cpp
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/materialsystem/effect.cpp
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/materialsystem/effect.cpp')
-rw-r--r--src/render/materialsystem/effect.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/materialsystem/effect.cpp b/src/render/materialsystem/effect.cpp
index 37b73ffa6..bf0e64a58 100644
--- a/src/render/materialsystem/effect.cpp
+++ b/src/render/materialsystem/effect.cpp
@@ -45,7 +45,7 @@
QT_BEGIN_NAMESPACE
-using namespace Qt3D;
+using namespace Qt3DCore;
namespace Qt3DRender {
namespace Render {
@@ -64,7 +64,7 @@ void Effect::cleanup()
{
}
-void Effect::updateFromPeer(Qt3D::QNode *peer)
+void Effect::updateFromPeer(Qt3DCore::QNode *peer)
{
QEffect *effect = static_cast<QEffect *>(peer);
@@ -78,7 +78,7 @@ void Effect::updateFromPeer(Qt3D::QNode *peer)
m_parameterPack.appendParameter(p->id());
}
-void Effect::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Effect::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
{
QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
QVariant propertyValue = propertyChange->value();
@@ -103,18 +103,18 @@ void Effect::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
}
}
-void Effect::appendRenderTechnique(const Qt3D::QNodeId &technique)
+void Effect::appendRenderTechnique(const Qt3DCore::QNodeId &technique)
{
if (!m_techniques.contains(technique))
m_techniques.append(technique);
}
-QList<Qt3D::QNodeId> Effect::techniques() const
+QList<Qt3DCore::QNodeId> Effect::techniques() const
{
return m_techniques;
}
-QList<Qt3D::QNodeId> Effect::parameters() const
+QList<Qt3DCore::QNodeId> Effect::parameters() const
{
return m_parameterPack.parameters();
}