summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3drenderer/items/quick3deffect.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-08-31 15:14:17 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-10-13 07:15:15 +0000
commitaf40840eedf35404ba4b39e890c158e2328ff6ec (patch)
treece4ac1f925c34b56704c99bd332e0436e68dbecc /src/quick3d/quick3drenderer/items/quick3deffect.cpp
parent0269afd106da5d4d999585b3bdb1332a2c01af12 (diff)
Move Render aspect into the Qt3DRender namespace
Updated examples and tests accordingly. Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drenderer/items/quick3deffect.cpp')
-rw-r--r--src/quick3d/quick3drenderer/items/quick3deffect.cpp22
1 files changed, 9 insertions, 13 deletions
diff --git a/src/quick3d/quick3drenderer/items/quick3deffect.cpp b/src/quick3d/quick3drenderer/items/quick3deffect.cpp
index 93e588945..435514bd7 100644
--- a/src/quick3d/quick3drenderer/items/quick3deffect.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3deffect.cpp
@@ -39,10 +39,8 @@
QT_BEGIN_NAMESPACE
-namespace Qt3D {
-
+namespace Qt3DRender {
namespace Render {
-
namespace Quick {
Quick3DEffect::Quick3DEffect(QObject *parent)
@@ -61,11 +59,11 @@ QQmlListProperty<QTechnique> Quick3DEffect::techniqueList()
QQmlListProperty<QParameter> Quick3DEffect::parameterList()
{
- return QQmlListProperty<Qt3D::QParameter>(this, 0,
- &Quick3DEffect::appendParameter,
- &Quick3DEffect::parametersCount,
- &Quick3DEffect::parameterAt,
- &Quick3DEffect::clearParameterList);
+ return QQmlListProperty<QParameter>(this, 0,
+ &Quick3DEffect::appendParameter,
+ &Quick3DEffect::parametersCount,
+ &Quick3DEffect::parameterAt,
+ &Quick3DEffect::clearParameterList);
}
void Quick3DEffect::appendTechnique(QQmlListProperty<QTechnique> *list, QTechnique *bar)
@@ -128,10 +126,8 @@ void Quick3DEffect::clearParameterList(QQmlListProperty<QParameter> *list)
qobject_cast<QEffect *>(effect->parentEffect())->removeParameter(p);
}
-} // Quick
-
-} // Render
-
-} // Qt3D
+} // namespace Quick
+} // namespace Render
+} // namespace Qt3DRender
QT_END_NAMESPACE