summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3drenderer
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2014-10-02 09:40:37 +0200
committerSean Harmer <sean.harmer@kdab.com>2014-10-03 21:18:49 +0200
commit3f20529e605eac75f416931c5c96ea03efa0c3ce (patch)
tree1db3865f104a9a61ab5eeb71b5fc77868adbe07b /src/quick3d/quick3drenderer
parent7b26f6a1746419161a8f875e341b3e31220f4141 (diff)
QAbstract removed from core
Task-number: QTBUG-41530 Change-Id: I32ed3d9b819e4e9eafdd36adc30bed9156284777 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drenderer')
-rw-r--r--src/quick3d/quick3drenderer/items/quick3deffect.cpp2
-rw-r--r--src/quick3d/quick3drenderer/items/quick3deffect.h4
-rw-r--r--src/quick3d/quick3drenderer/items/quick3dtechnique.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/quick3d/quick3drenderer/items/quick3deffect.cpp b/src/quick3d/quick3drenderer/items/quick3deffect.cpp
index 5c67da2db..8d9cc2469 100644
--- a/src/quick3d/quick3drenderer/items/quick3deffect.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3deffect.cpp
@@ -103,7 +103,7 @@ void Quick3DEffect::clearTechniqueList(QQmlListProperty<QTechnique> *list)
if (eff) {
// Ownership of techniques is handled by the QmlEngine so we shouldn't class clearTechniques
// which deletes techniques
- Q_FOREACH (QAbstractTechnique *tech, eff->parentEffect()->techniques())
+ Q_FOREACH (QTechnique *tech, eff->parentEffect()->techniques())
eff->parentEffect()->removeTechnique(tech);
}
}
diff --git a/src/quick3d/quick3drenderer/items/quick3deffect.h b/src/quick3d/quick3drenderer/items/quick3deffect.h
index e61b8efd1..09db27bcf 100644
--- a/src/quick3d/quick3drenderer/items/quick3deffect.h
+++ b/src/quick3d/quick3drenderer/items/quick3deffect.h
@@ -43,8 +43,8 @@
#define QT3D_RENDER_QUICK_QUICK3DEFFECT_H
#include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
-#include <Qt3DCore/qabstracteffect.h>
#include <QQmlListProperty>
+#include <Qt3DRenderer/qeffect.h>
#include <Qt3DRenderer/qtechnique.h>
@@ -65,7 +65,7 @@ class QT3DQUICKRENDERERSHARED_EXPORT Quick3DEffect : public QObject
public:
explicit Quick3DEffect(QObject *parent = 0);
- inline QAbstractEffect *parentEffect() const { return qobject_cast<QAbstractEffect*>(parent()); }
+ inline QEffect *parentEffect() const { return qobject_cast<QEffect*>(parent()); }
QQmlListProperty<Qt3D::QTechnique> techniqueList();
QQmlListProperty<Qt3D::QParameter> parameterList();
diff --git a/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp b/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp
index a22f60400..a41988ffe 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dtechnique.cpp
@@ -126,7 +126,7 @@ void Quick3DTechnique::clearRenderPasses(QQmlListProperty<QRenderPass> *list)
{
Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
if (technique) {
- Q_FOREACH (QAbstractRenderPass *pass, technique->parentTechnique()->renderPasses())
+ Q_FOREACH (QRenderPass *pass, technique->parentTechnique()->renderPasses())
technique->parentTechnique()->removePass(pass);
emit technique->renderPassesChanged();
}