summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem/parameter.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/parameter.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/parameter.cpp')
-rw-r--r--src/render/materialsystem/parameter.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/materialsystem/parameter.cpp b/src/render/materialsystem/parameter.cpp
index afc44ed58..34eb395f7 100644
--- a/src/render/materialsystem/parameter.cpp
+++ b/src/render/materialsystem/parameter.cpp
@@ -44,7 +44,7 @@
QT_BEGIN_NAMESPACE
-using namespace Qt3D;
+using namespace Qt3DCore;
namespace Qt3DRender {
namespace Render {
@@ -56,14 +56,14 @@ Parameter::Parameter()
{
}
-void Parameter::updateFromPeer(Qt3D::QNode *mat)
+void Parameter::updateFromPeer(Qt3DCore::QNode *mat)
{
QParameter *param = static_cast<QParameter *>(mat);
m_name = param->name();
m_value = toBackendValue(param->value());
}
-void Parameter::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Parameter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
{
QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);