summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3drender/items
diff options
context:
space:
mode:
authorRobert Brock <robert.brock@kdab.com>2016-03-01 09:06:18 +0000
committerRobert Brock <robert.brock@kdab.com>2016-03-08 15:59:07 +0000
commit02da4f2145aa5eeadbbd9b33ba739db1366dee1c (patch)
tree41ec95a13a8ff76c3fe65c68370adb8b14152b45 /src/quick3d/quick3drender/items
parent7284b37bf81b08530afcc141b3cf2f5358b735c1 (diff)
QTechnique renaming
annotations -> filterKeys addPass -> addRenderPass removePass -> removeRenderPass Change-Id: Ica1731ee3100b249e4fef04f45c0e6326732d644 Task-number: QTBUG-51458 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drender/items')
-rw-r--r--src/quick3d/quick3drender/items/quick3dtechnique.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick3d/quick3drender/items/quick3dtechnique.cpp b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
index 00d5e8a6b..6c817d631 100644
--- a/src/quick3d/quick3drender/items/quick3dtechnique.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
@@ -97,7 +97,7 @@ void Quick3DTechnique::appendRenderPass(QQmlListProperty<QRenderPass> *list, QRe
{
Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
if (technique) {
- technique->parentTechnique()->addPass(renderPass);
+ technique->parentTechnique()->addRenderPass(renderPass);
}
}
@@ -122,7 +122,7 @@ void Quick3DTechnique::clearRenderPasses(QQmlListProperty<QRenderPass> *list)
Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
if (technique) {
Q_FOREACH (QRenderPass *pass, technique->parentTechnique()->renderPasses())
- technique->parentTechnique()->removePass(pass);
+ technique->parentTechnique()->removeRenderPass(pass);
}
}
@@ -149,7 +149,7 @@ QAnnotation *Quick3DTechnique::annotationAt(QQmlListProperty<QAnnotation> *list,
{
Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
if (technique)
- return technique->parentTechnique()->annotations().at(index);
+ return technique->parentTechnique()->filterKeys().at(index);
return 0;
}
@@ -157,7 +157,7 @@ int Quick3DTechnique::annotationCount(QQmlListProperty<QAnnotation> *list)
{
Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
if (technique)
- return technique->parentTechnique()->annotations().size();
+ return technique->parentTechnique()->filterKeys().size();
return 0;
}
@@ -165,7 +165,7 @@ void Quick3DTechnique::clearAnnotationList(QQmlListProperty<QAnnotation> *list)
{
Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
if (technique) {
- Q_FOREACH (QAnnotation *a, technique->parentTechnique()->annotations())
+ Q_FOREACH (QAnnotation *a, technique->parentTechnique()->filterKeys())
technique->parentTechnique()->removeAnnotation(a);
}
}