QTechniqueFilter: renamed criteria property to requires

Change-Id: Id7b06add196edc64c553cdeff31bc3333fa7acaf
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2 files changed, 17 insertions, 17 deletions

diff --git a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp
index 44a85f72b..2c2fea8a5 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.cpp
@@ -54,25 +54,25 @@ Quick3DTechniqueFilter::Quick3DTechniqueFilter(QObject *parent)
 {
 }
 
-QQmlListProperty<Qt3D::QAnnotation> Quick3DTechniqueFilter::criteriaList()
+QQmlListProperty<Qt3D::QAnnotation> Quick3DTechniqueFilter::requireList()
 {
     return QQmlListProperty<Qt3D::QAnnotation>(this, 0,
-                                       &Quick3DTechniqueFilter::appendCriterion,
-                                       &Quick3DTechniqueFilter::criteriaCount,
-                                       &Quick3DTechniqueFilter::criterionAt,
-                                       &Quick3DTechniqueFilter::clearCriteria);
+                                       &Quick3DTechniqueFilter::appendRequire,
+                                       &Quick3DTechniqueFilter::requiresCount,
+                                       &Quick3DTechniqueFilter::requireAt,
+                                       &Quick3DTechniqueFilter::clearRequires);
 }
 
-void Quick3DTechniqueFilter::appendCriterion(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion)
+void Quick3DTechniqueFilter::appendRequire(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion)
 {
     Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
     if (filter) {
         criterion->setParent(filter->parentTechniqueFilter());
-        filter->parentTechniqueFilter()->addCriterion(criterion);
+        filter->parentTechniqueFilter()->addRequirement(criterion);
     }
 }
 
-QAnnotation *Quick3DTechniqueFilter::criterionAt(QQmlListProperty<QAnnotation> *list, int index)
+QAnnotation *Quick3DTechniqueFilter::requireAt(QQmlListProperty<QAnnotation> *list, int index)
 {
     Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
     if (filter)
@@ -80,7 +80,7 @@ QAnnotation *Quick3DTechniqueFilter::criterionAt(QQmlListProperty<QAnnotation> *
     return 0;
 }
 
-int Quick3DTechniqueFilter::criteriaCount(QQmlListProperty<QAnnotation> *list)
+int Quick3DTechniqueFilter::requiresCount(QQmlListProperty<QAnnotation> *list)
 {
     Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
     if (filter)
@@ -88,12 +88,12 @@ int Quick3DTechniqueFilter::criteriaCount(QQmlListProperty<QAnnotation> *list)
     return 0;
 }
 
-void Quick3DTechniqueFilter::clearCriteria(QQmlListProperty<QAnnotation> *list)
+void Quick3DTechniqueFilter::clearRequires(QQmlListProperty<QAnnotation> *list)
 {
     Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
     if (filter) {
         Q_FOREACH (QAnnotation *criterion, filter->parentTechniqueFilter()->criteria())
-            filter->parentTechniqueFilter()->removeCriterion(criterion);
+            filter->parentTechniqueFilter()->removeRequirement(criterion);
     }
 }
 
diff --git a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h b/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h
index 235bf1392..ce890f457 100644
--- a/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h
+++ b/src/quick3d/quick3drenderer/items/quick3dtechniquefilter.h
@@ -59,19 +59,19 @@ namespace Quick {
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DTechniqueFilter : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> criteria READ criteriaList)
+    Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> requires READ requireList)
 
 public:
     explicit Quick3DTechniqueFilter(QObject *parent = 0);
-    QQmlListProperty<Qt3D::QAnnotation> criteriaList();
+    QQmlListProperty<Qt3D::QAnnotation> requireList();
 
     inline QTechniqueFilter *parentTechniqueFilter() const { return qobject_cast<Qt3D::QTechniqueFilter*>(parent()); }
 
 private:
-    static void appendCriterion(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion);
-    static QAnnotation *criterionAt(QQmlListProperty<QAnnotation> *list, int index);
-    static int criteriaCount(QQmlListProperty<QAnnotation> *list);
-    static void clearCriteria(QQmlListProperty<QAnnotation> *list);
+    static void appendRequire(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion);
+    static QAnnotation *requireAt(QQmlListProperty<QAnnotation> *list, int index);
+    static int requiresCount(QQmlListProperty<QAnnotation> *list);
+    static void clearRequires(QQmlListProperty<QAnnotation> *list);
 
 };