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/material.cpp | |
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/material.cpp')
-rw-r--r-- | src/render/materialsystem/material.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/render/materialsystem/material.cpp b/src/render/materialsystem/material.cpp index c096c1a98..faf934d3e 100644 --- a/src/render/materialsystem/material.cpp +++ b/src/render/materialsystem/material.cpp @@ -46,7 +46,7 @@ #include <Qt3DCore/qscenepropertychange.h> #include <QOpenGLShaderProgram> -using namespace Qt3D; +using namespace Qt3DCore; QT_BEGIN_NAMESPACE @@ -69,7 +69,7 @@ void Material::cleanup() m_parameterPack.clear(); } -void Material::updateFromPeer(Qt3D::QNode *node) +void Material::updateFromPeer(Qt3DCore::QNode *node) { QMaterial *mat = static_cast<QMaterial *>(node); m_parameterPack.clear(); @@ -80,7 +80,7 @@ void Material::updateFromPeer(Qt3D::QNode *node) m_parameterPack.appendParameter(p->id()); } -void Material::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) +void Material::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); @@ -111,12 +111,12 @@ void Material::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) } } -QList<Qt3D::QNodeId> Material::parameters() const +QList<Qt3DCore::QNodeId> Material::parameters() const { return m_parameterPack.parameters(); } -Qt3D::QNodeId Material::effect() const +Qt3DCore::QNodeId Material::effect() const { return m_effectUuid; } |