summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem/technique.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/technique.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/technique.cpp')
-rw-r--r--src/render/materialsystem/technique.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp
index a3315f30e..ac2e4554c 100644
--- a/src/render/materialsystem/technique.cpp
+++ b/src/render/materialsystem/technique.cpp
@@ -51,7 +51,7 @@
QT_BEGIN_NAMESPACE
-using namespace Qt3D;
+using namespace Qt3DCore;
namespace Qt3DRender {
namespace Render {
@@ -72,7 +72,7 @@ void Technique::cleanup()
{
}
-void Technique::updateFromPeer(Qt3D::QNode *peer)
+void Technique::updateFromPeer(Qt3DCore::QNode *peer)
{
m_parameterPack.clear();
m_renderPasses.clear();
@@ -94,7 +94,7 @@ void Technique::updateFromPeer(Qt3D::QNode *peer)
}
}
-void Technique::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Technique::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
{
QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
switch (e->type()) {
@@ -141,28 +141,28 @@ void Technique::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
}
}
-QList<Qt3D::QNodeId> Technique::parameters() const
+QList<Qt3DCore::QNodeId> Technique::parameters() const
{
return m_parameterPack.parameters();
}
-void Technique::appendRenderPass(const Qt3D::QNodeId &renderPassId)
+void Technique::appendRenderPass(const Qt3DCore::QNodeId &renderPassId)
{
if (!m_renderPasses.contains(renderPassId))
m_renderPasses.append(renderPassId);
}
-void Technique::removeRenderPass(const Qt3D::QNodeId &renderPassId)
+void Technique::removeRenderPass(const Qt3DCore::QNodeId &renderPassId)
{
m_renderPasses.removeOne(renderPassId);
}
-QList<Qt3D::QNodeId> Technique::annotations() const
+QList<Qt3DCore::QNodeId> Technique::annotations() const
{
return m_annotationList;
}
-QList<Qt3D::QNodeId> Technique::renderPasses() const
+QList<Qt3DCore::QNodeId> Technique::renderPasses() const
{
return m_renderPasses;
}
@@ -172,13 +172,13 @@ QOpenGLFilter *Technique::openGLFilter() const
return m_openglFilter;
}
-void Technique::appendAnnotation(const Qt3D::QNodeId &criterionId)
+void Technique::appendAnnotation(const Qt3DCore::QNodeId &criterionId)
{
if (!m_annotationList.contains(criterionId))
m_annotationList.append(criterionId);
}
-void Technique::removeAnnotation(const Qt3D::QNodeId &criterionId)
+void Technique::removeAnnotation(const Qt3DCore::QNodeId &criterionId)
{
m_annotationList.removeOne(criterionId);
}