QRenderPass: renamed criteria property to annotations

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

2 files changed, 20 insertions, 20 deletions

diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp b/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
index 4196a5a19..c4e507c57 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.cpp
@@ -56,13 +56,13 @@ Quick3DRenderPass::Quick3DRenderPass(QObject *parent)
 {
 }
 
-QQmlListProperty<QAnnotation> Quick3DRenderPass::criteriaList()
+QQmlListProperty<QAnnotation> Quick3DRenderPass::annotationList()
 {
     return QQmlListProperty<Qt3D::QAnnotation>(this, 0,
-                                              &Quick3DRenderPass::appendCriteria,
-                                              &Quick3DRenderPass::criteriaCount,
-                                              &Quick3DRenderPass::criterionAt,
-                                              &Quick3DRenderPass::clearCriteria);
+                                              &Quick3DRenderPass::appendAnnotation,
+                                              &Quick3DRenderPass::annotationsCount,
+                                              &Quick3DRenderPass::annotationAt,
+                                              &Quick3DRenderPass::clearAnnotations);
 }
 
 QQmlListProperty<QParameterMapper> Quick3DRenderPass::bindingList()
@@ -83,29 +83,29 @@ QQmlListProperty<QRenderState> Quick3DRenderPass::renderStateList()
                                               &Quick3DRenderPass::clearRenderStates);
 }
 
-void Quick3DRenderPass::appendCriteria(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion)
+void Quick3DRenderPass::appendAnnotation(QQmlListProperty<QAnnotation> *list, QAnnotation *annotation)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    rPass->parentRenderPass()->addCriterion(criterion);
+    rPass->parentRenderPass()->addAnnotation(annotation);
 }
 
-QAnnotation *Quick3DRenderPass::criterionAt(QQmlListProperty<QAnnotation> *list, int index)
+QAnnotation *Quick3DRenderPass::annotationAt(QQmlListProperty<QAnnotation> *list, int index)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    return rPass->parentRenderPass()->criteria().at(index);
+    return rPass->parentRenderPass()->annotations().at(index);
 }
 
-int Quick3DRenderPass::criteriaCount(QQmlListProperty<QAnnotation> *list)
+int Quick3DRenderPass::annotationsCount(QQmlListProperty<QAnnotation> *list)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    return rPass->parentRenderPass()->criteria().count();
+    return rPass->parentRenderPass()->annotations().count();
 }
 
-void Quick3DRenderPass::clearCriteria(QQmlListProperty<QAnnotation> *list)
+void Quick3DRenderPass::clearAnnotations(QQmlListProperty<QAnnotation> *list)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    Q_FOREACH (QAnnotation *c, rPass->parentRenderPass()->criteria())
-        rPass->parentRenderPass()->removeCriterion(c);
+    Q_FOREACH (QAnnotation *c, rPass->parentRenderPass()->annotations())
+        rPass->parentRenderPass()->removeAnnotation(c);
 }
 
 void Quick3DRenderPass::appendBinding(QQmlListProperty<QParameterMapper> *list, QParameterMapper *binding)
diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpass.h b/src/quick3d/quick3drenderer/items/quick3drenderpass.h
index e84efa4ab..6ffdc281a 100644
--- a/src/quick3d/quick3drenderer/items/quick3drenderpass.h
+++ b/src/quick3d/quick3drenderer/items/quick3drenderpass.h
@@ -58,22 +58,22 @@ namespace Quick {
 class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderPass : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> criteria READ criteriaList)
+    Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> annotations READ annotationList)
     Q_PROPERTY(QQmlListProperty<Qt3D::QParameterMapper> bindings READ bindingList)
     Q_PROPERTY(QQmlListProperty<Qt3D::QRenderState> renderStates READ renderStateList)
 public:
     explicit Quick3DRenderPass(QObject *parent = 0);
 
-    QQmlListProperty<Qt3D::QAnnotation> criteriaList();
+    QQmlListProperty<Qt3D::QAnnotation> annotationList();
     QQmlListProperty<Qt3D::QParameterMapper> bindingList();
     QQmlListProperty<Qt3D::QRenderState> renderStateList();
     inline QRenderPass *parentRenderPass() const { return qobject_cast<QRenderPass *>(parent()); }
 
 private:
-    static void appendCriteria(QQmlListProperty<Qt3D::QAnnotation> *list, QAnnotation *criterion);
-    static QAnnotation *criterionAt(QQmlListProperty<Qt3D::QAnnotation> *list, int index);
-    static int criteriaCount(QQmlListProperty<Qt3D::QAnnotation> *list);
-    static void clearCriteria(QQmlListProperty<Qt3D::QAnnotation> *list);
+    static void appendAnnotation(QQmlListProperty<Qt3D::QAnnotation> *list, QAnnotation *criterion);
+    static QAnnotation *annotationAt(QQmlListProperty<Qt3D::QAnnotation> *list, int index);
+    static int annotationsCount(QQmlListProperty<Qt3D::QAnnotation> *list);
+    static void clearAnnotations(QQmlListProperty<Qt3D::QAnnotation> *list);
 
     static void appendBinding(QQmlListProperty<Qt3D::QParameterMapper> *list, QParameterMapper *binding);
     static QParameterMapper *bindingAt(QQmlListProperty<Qt3D::QParameterMapper> *list, int index);