diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-23 16:53:03 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-27 11:19:07 +0000 |
commit | 1260bea1056b3431223de2053ecb7926af12a931 (patch) | |
tree | 32b9097e5d5eaab646cfa95ed7d98f03f8a33cae /src/quick3d/quick3drender/items | |
parent | e5b4a0f6af39e96ecbb91fe3a0de1e6118a52a85 (diff) |
Rename QTechniqueFilter::criteria() to matchAll()
As per API review.
Change-Id: Icaf9d489b760f5df101141f2662e44658575e850
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/quick3drender/items')
-rw-r--r-- | src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp index 00bde52ce..8eb505470 100644 --- a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp +++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp @@ -81,7 +81,7 @@ QFilterKey *Quick3DTechniqueFilter::requireAt(QQmlListProperty<QFilterKey> *list { Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object); if (filter) - return filter->parentTechniqueFilter()->criteria().at(index); + return filter->parentTechniqueFilter()->matchAll().at(index); return 0; } @@ -89,7 +89,7 @@ int Quick3DTechniqueFilter::requiresCount(QQmlListProperty<QFilterKey> *list) { Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object); if (filter) - return filter->parentTechniqueFilter()->criteria().size(); + return filter->parentTechniqueFilter()->matchAll().size(); return 0; } @@ -97,7 +97,7 @@ void Quick3DTechniqueFilter::clearRequires(QQmlListProperty<QFilterKey> *list) { Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object); if (filter) { - Q_FOREACH (QFilterKey *criterion, filter->parentTechniqueFilter()->criteria()) + Q_FOREACH (QFilterKey *criterion, filter->parentTechniqueFilter()->matchAll()) filter->parentTechniqueFilter()->removeMatch(criterion); } } |