summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3drender/items
diff options
context:
space:
mode:
authorRobert Brock <robert.brock@kdab.com>2016-03-18 17:08:21 +0000
committerSean Harmer <sean.harmer@kdab.com>2016-03-23 10:05:59 +0000
commit74a5c1943db6e8b244ccd2f18485f0d0da3e3ed7 (patch)
tree8fe2fded4dda8b53e124bd6ff47ecaf2408522d9 /src/quick3d/quick3drender/items
parent98ada0f0a9edf5132c08c2603ba20fb5e3001c63 (diff)
Class QRenderPassFilter renaming
includes -> matchAny addInclude -> addMatch removeInclude -> removeMatch Change-Id: Ib9288ab79b3e76ae8a8aa2f7e3f20c5386438a25 Task-number: QTBUG-51456 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drender/items')
-rw-r--r--src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
index 73baa23c8..bbc91d605 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
@@ -74,7 +74,7 @@ void Quick3DRenderPassFilter::appendInclude(QQmlListProperty<QFilterKey> *list,
Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
if (filter) {
annotation->setParent(filter->parentRenderPassFilter());
- filter->parentRenderPassFilter()->addInclude(annotation);
+ filter->parentRenderPassFilter()->addMatch(annotation);
}
}
@@ -82,7 +82,7 @@ QFilterKey *Quick3DRenderPassFilter::includeAt(QQmlListProperty<QFilterKey> *lis
{
Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
if (filter)
- return filter->parentRenderPassFilter()->includes().at(index);
+ return filter->parentRenderPassFilter()->matchAny().at(index);
return 0;
}
@@ -90,7 +90,7 @@ int Quick3DRenderPassFilter::includesCount(QQmlListProperty<QFilterKey> *list)
{
Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
if (filter)
- return filter->parentRenderPassFilter()->includes().count();
+ return filter->parentRenderPassFilter()->matchAny().count();
return 0;
}
@@ -98,8 +98,8 @@ void Quick3DRenderPassFilter::clearIncludes(QQmlListProperty<QFilterKey> *list)
{
Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
if (filter) {
- Q_FOREACH (QFilterKey *criterion, filter->parentRenderPassFilter()->includes())
- filter->parentRenderPassFilter()->removeInclude(criterion);
+ Q_FOREACH (QFilterKey *criterion, filter->parentRenderPassFilter()->matchAny())
+ filter->parentRenderPassFilter()->removeMatch(criterion);
}
}