QAnnotation changes

Task-number: QTBUG-51454
Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

8 files changed, 70 insertions, 70 deletions

diff --git a/src/quick3d/quick3drender/items/quick3drenderpass.cpp b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
index 5433c1bd2..048648467 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpass.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
@@ -51,13 +51,13 @@ Quick3DRenderPass::Quick3DRenderPass(QObject *parent)
 {
 }
 
-QQmlListProperty<QAnnotation> Quick3DRenderPass::annotationList()
+QQmlListProperty<QFilterKey> Quick3DRenderPass::filterKeyList()
 {
-    return QQmlListProperty<QAnnotation>(this, 0,
-                                         &Quick3DRenderPass::appendAnnotation,
-                                         &Quick3DRenderPass::annotationsCount,
-                                         &Quick3DRenderPass::annotationAt,
-                                         &Quick3DRenderPass::clearAnnotations);
+    return QQmlListProperty<QFilterKey>(this, 0,
+                                         &Quick3DRenderPass::appendFilterKey,
+                                         &Quick3DRenderPass::filterKeysCount,
+                                         &Quick3DRenderPass::filterKeyAt,
+                                         &Quick3DRenderPass::clearFilterKey);
 }
 
 QQmlListProperty<QRenderState> Quick3DRenderPass::renderStateList()
@@ -78,29 +78,29 @@ QQmlListProperty<QParameter> Quick3DRenderPass::parameterList()
                                         &Quick3DRenderPass::clearParameterList);
 }
 
-void Quick3DRenderPass::appendAnnotation(QQmlListProperty<QAnnotation> *list, QAnnotation *annotation)
+void Quick3DRenderPass::appendFilterKey(QQmlListProperty<QFilterKey> *list, QFilterKey *filterKey)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    rPass->parentRenderPass()->addAnnotation(annotation);
+    rPass->parentRenderPass()->addFilterKey(filterKey);
 }
 
-QAnnotation *Quick3DRenderPass::annotationAt(QQmlListProperty<QAnnotation> *list, int index)
+QFilterKey *Quick3DRenderPass::filterKeyAt(QQmlListProperty<QFilterKey> *list, int index)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    return rPass->parentRenderPass()->annotations().at(index);
+    return rPass->parentRenderPass()->filterKeys().at(index);
 }
 
-int Quick3DRenderPass::annotationsCount(QQmlListProperty<QAnnotation> *list)
+int Quick3DRenderPass::filterKeysCount(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    return rPass->parentRenderPass()->annotations().count();
+    return rPass->parentRenderPass()->filterKeys().count();
 }
 
-void Quick3DRenderPass::clearAnnotations(QQmlListProperty<QAnnotation> *list)
+void Quick3DRenderPass::clearFilterKey(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DRenderPass *rPass = qobject_cast<Quick3DRenderPass *>(list->object);
-    Q_FOREACH (QAnnotation *c, rPass->parentRenderPass()->annotations())
-        rPass->parentRenderPass()->removeAnnotation(c);
+    Q_FOREACH (QFilterKey *c, rPass->parentRenderPass()->filterKeys())
+        rPass->parentRenderPass()->removeFilterKey(c);
 }
 
 void Quick3DRenderPass::appendRenderState(QQmlListProperty<QRenderState> *list, QRenderState *state)
diff --git a/src/quick3d/quick3drender/items/quick3drenderpass_p.h b/src/quick3d/quick3drender/items/quick3drenderpass_p.h
index a7e7f6cd4..6ac940e23 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpass_p.h
+++ b/src/quick3d/quick3drender/items/quick3drenderpass_p.h
@@ -65,23 +65,23 @@ namespace Quick {
 class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderPass : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> annotations READ annotationList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> filterKeys READ filterKeyList)
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderState> renderStates READ renderStateList)
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ parameterList)
 public:
     explicit Quick3DRenderPass(QObject *parent = 0);
 
-    QQmlListProperty<QAnnotation> annotationList();
+    QQmlListProperty<QFilterKey> filterKeyList();
     QQmlListProperty<QRenderState> renderStateList();
     QQmlListProperty<QParameter> parameterList();
 
     inline QRenderPass *parentRenderPass() const { return qobject_cast<QRenderPass *>(parent()); }
 
 private:
-    static void appendAnnotation(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion);
-    static QAnnotation *annotationAt(QQmlListProperty<QAnnotation> *list, int index);
-    static int annotationsCount(QQmlListProperty<QAnnotation> *list);
-    static void clearAnnotations(QQmlListProperty<QAnnotation> *list);
+    static void appendFilterKey(QQmlListProperty<QFilterKey> *list, QFilterKey *filterKey);
+    static QFilterKey *filterKeyAt(QQmlListProperty<QFilterKey> *list, int index);
+    static int filterKeysCount(QQmlListProperty<QFilterKey> *list);
+    static void clearFilterKey(QQmlListProperty<QFilterKey> *list);
 
     static void appendRenderState(QQmlListProperty<QRenderState> *list, QRenderState *state);
     static QRenderState *renderStateAt(QQmlListProperty<QRenderState> *list, int index);
diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
index 30b3b9a45..73baa23c8 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
@@ -50,9 +50,9 @@ Quick3DRenderPassFilter::Quick3DRenderPassFilter(QObject *parent)
 {
 }
 
-QQmlListProperty<QAnnotation> Quick3DRenderPassFilter::includeList()
+QQmlListProperty<QFilterKey> Quick3DRenderPassFilter::includeList()
 {
-    return QQmlListProperty<QAnnotation>(this, 0,
+    return QQmlListProperty<QFilterKey>(this, 0,
                                          &Quick3DRenderPassFilter::appendInclude,
                                          &Quick3DRenderPassFilter::includesCount,
                                          &Quick3DRenderPassFilter::includeAt,
@@ -69,7 +69,7 @@ QQmlListProperty<QParameter> Quick3DRenderPassFilter::parameterList()
 
 }
 
-void Quick3DRenderPassFilter::appendInclude(QQmlListProperty<QAnnotation> *list, QAnnotation *annotation)
+void Quick3DRenderPassFilter::appendInclude(QQmlListProperty<QFilterKey> *list, QFilterKey *annotation)
 {
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter) {
@@ -78,7 +78,7 @@ void Quick3DRenderPassFilter::appendInclude(QQmlListProperty<QAnnotation> *list,
     }
 }
 
-QAnnotation *Quick3DRenderPassFilter::includeAt(QQmlListProperty<QAnnotation> *list, int index)
+QFilterKey *Quick3DRenderPassFilter::includeAt(QQmlListProperty<QFilterKey> *list, int index)
 {
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter)
@@ -86,7 +86,7 @@ QAnnotation *Quick3DRenderPassFilter::includeAt(QQmlListProperty<QAnnotation> *l
     return 0;
 }
 
-int Quick3DRenderPassFilter::includesCount(QQmlListProperty<QAnnotation> *list)
+int Quick3DRenderPassFilter::includesCount(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter)
@@ -94,11 +94,11 @@ int Quick3DRenderPassFilter::includesCount(QQmlListProperty<QAnnotation> *list)
     return 0;
 }
 
-void Quick3DRenderPassFilter::clearIncludes(QQmlListProperty<QAnnotation> *list)
+void Quick3DRenderPassFilter::clearIncludes(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter) {
-        Q_FOREACH (QAnnotation *criterion, filter->parentRenderPassFilter()->includes())
+        Q_FOREACH (QFilterKey *criterion, filter->parentRenderPassFilter()->includes())
             filter->parentRenderPassFilter()->removeInclude(criterion);
     }
 }
diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h
index 04fb8cef9..d1b350c0c 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter_p.h
@@ -53,7 +53,7 @@
 
 #include <Qt3DQuick/private/quick3dnode_p.h>
 #include <Qt3DRender/qrenderpassfilter.h>
-#include <Qt3DRender/qannotation.h>
+#include <Qt3DRender/qfilterkey.h>
 #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <QQmlListProperty>
 
@@ -66,22 +66,22 @@ namespace Quick {
 class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DRenderPassFilter : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> includes READ includeList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> includes READ includeList)
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ parameterList)
 
 public:
     explicit Quick3DRenderPassFilter(QObject *parent = 0);
 
-    QQmlListProperty<QAnnotation> includeList();
+    QQmlListProperty<QFilterKey> includeList();
     QQmlListProperty<QParameter> parameterList();
 
     inline QRenderPassFilter *parentRenderPassFilter() const { return qobject_cast<Qt3DRender::QRenderPassFilter*>(parent()); }
 
 private:
-    static void appendInclude(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion);
-    static QAnnotation *includeAt(QQmlListProperty<QAnnotation> *list, int index);
-    static int includesCount(QQmlListProperty<QAnnotation> *list);
-    static void clearIncludes(QQmlListProperty<QAnnotation> *list);
+    static void appendInclude(QQmlListProperty<QFilterKey> *list, QFilterKey *criterion);
+    static QFilterKey *includeAt(QQmlListProperty<QFilterKey> *list, int index);
+    static int includesCount(QQmlListProperty<QFilterKey> *list);
+    static void clearIncludes(QQmlListProperty<QFilterKey> *list);
 
     static void appendParameter(QQmlListProperty<QParameter> *list, QParameter *param);
     static QParameter *parameterAt(QQmlListProperty<QParameter> *list, int index);
diff --git a/src/quick3d/quick3drender/items/quick3dtechnique.cpp b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
index 6c817d631..06b9114bd 100644
--- a/src/quick3d/quick3drender/items/quick3dtechnique.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
@@ -126,26 +126,26 @@ void Quick3DTechnique::clearRenderPasses(QQmlListProperty<QRenderPass> *list)
     }
 }
 
-QQmlListProperty<QAnnotation> Quick3DTechnique::annotationList()
+QQmlListProperty<QFilterKey> Quick3DTechnique::filterKeyList()
 {
-    return QQmlListProperty<QAnnotation>(this, 0,
-                                         &Quick3DTechnique::appendAnnotation,
-                                         &Quick3DTechnique::annotationCount,
-                                         &Quick3DTechnique::annotationAt,
-                                         &Quick3DTechnique::clearAnnotationList);
+    return QQmlListProperty<QFilterKey>(this, 0,
+                                         &Quick3DTechnique::appendFilterKey,
+                                         &Quick3DTechnique::filterKeyCount,
+                                         &Quick3DTechnique::filterKeyAt,
+                                         &Quick3DTechnique::clearFilterKeyList);
 }
 
-void Quick3DTechnique::appendAnnotation(QQmlListProperty<QAnnotation> *list, QAnnotation *annotation)
+void Quick3DTechnique::appendFilterKey(QQmlListProperty<QFilterKey> *list, QFilterKey *filterKey)
 {
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
     if (technique) {
-        if (!annotation->parent())
-            annotation->setParent(technique->parentTechnique());
-        technique->parentTechnique()->addAnnotation(annotation);
+        if (!filterKey->parent())
+            filterKey->setParent(technique->parentTechnique());
+        technique->parentTechnique()->addFilterKey(filterKey);
     }
 }
 
-QAnnotation *Quick3DTechnique::annotationAt(QQmlListProperty<QAnnotation> *list, int index)
+QFilterKey *Quick3DTechnique::filterKeyAt(QQmlListProperty<QFilterKey> *list, int index)
 {
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
     if (technique)
@@ -153,7 +153,7 @@ QAnnotation *Quick3DTechnique::annotationAt(QQmlListProperty<QAnnotation> *list,
     return 0;
 }
 
-int Quick3DTechnique::annotationCount(QQmlListProperty<QAnnotation> *list)
+int Quick3DTechnique::filterKeyCount(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
     if (technique)
@@ -161,12 +161,12 @@ int Quick3DTechnique::annotationCount(QQmlListProperty<QAnnotation> *list)
     return 0;
 }
 
-void Quick3DTechnique::clearAnnotationList(QQmlListProperty<QAnnotation> *list)
+void Quick3DTechnique::clearFilterKeyList(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
     if (technique) {
-        Q_FOREACH (QAnnotation *a, technique->parentTechnique()->filterKeys())
-            technique->parentTechnique()->removeAnnotation(a);
+        Q_FOREACH (QFilterKey *a, technique->parentTechnique()->filterKeys())
+            technique->parentTechnique()->removeFilterKey(a);
     }
 }
 
diff --git a/src/quick3d/quick3drender/items/quick3dtechnique_p.h b/src/quick3d/quick3drender/items/quick3dtechnique_p.h
index 4be8d57df..203befcb7 100644
--- a/src/quick3d/quick3drender/items/quick3dtechnique_p.h
+++ b/src/quick3d/quick3drender/items/quick3dtechnique_p.h
@@ -64,13 +64,13 @@ namespace Quick {
 class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechnique : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> annotations READ annotationList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> filterKeys READ filterKeyList)
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QRenderPass> renderPasses READ renderPassList)
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ parameterList)
 public:
     explicit Quick3DTechnique(QObject *parent = 0);
 
-    QQmlListProperty<QAnnotation> annotationList();
+    QQmlListProperty<QFilterKey> filterKeyList();
     QQmlListProperty<QRenderPass> renderPassList();
     QQmlListProperty<QParameter> parameterList();
 
@@ -84,10 +84,10 @@ private:
     static int parametersCount(QQmlListProperty<QParameter> *list);
     static void clearParameterList(QQmlListProperty<QParameter> *list);
 
-    static void appendAnnotation(QQmlListProperty<QAnnotation> *list, QAnnotation *Annotation);
-    static QAnnotation *annotationAt(QQmlListProperty<QAnnotation> *list, int index);
-    static int annotationCount(QQmlListProperty<QAnnotation> *list);
-    static void clearAnnotationList(QQmlListProperty<QAnnotation> *list);
+    static void appendFilterKey(QQmlListProperty<QFilterKey> *list, QFilterKey *filterKey);
+    static QFilterKey *filterKeyAt(QQmlListProperty<QFilterKey> *list, int index);
+    static int filterKeyCount(QQmlListProperty<QFilterKey> *list);
+    static void clearFilterKeyList(QQmlListProperty<QFilterKey> *list);
 
     static void appendRenderPass(QQmlListProperty<QRenderPass> *list, QRenderPass* renderPass);
     static QRenderPass *renderPassAt(QQmlListProperty<QRenderPass> *list, int index);
diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
index 65dec82a0..00bde52ce 100644
--- a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
@@ -50,9 +50,9 @@ Quick3DTechniqueFilter::Quick3DTechniqueFilter(QObject *parent)
 {
 }
 
-QQmlListProperty<QAnnotation> Quick3DTechniqueFilter::matchList()
+QQmlListProperty<QFilterKey> Quick3DTechniqueFilter::matchList()
 {
-    return QQmlListProperty<QAnnotation>(this, 0,
+    return QQmlListProperty<QFilterKey>(this, 0,
                                          &Quick3DTechniqueFilter::appendRequire,
                                          &Quick3DTechniqueFilter::requiresCount,
                                          &Quick3DTechniqueFilter::requireAt,
@@ -68,7 +68,7 @@ QQmlListProperty<QParameter> Quick3DTechniqueFilter::parameterList()
                                         &Quick3DTechniqueFilter::clearParameterList);
 }
 
-void Quick3DTechniqueFilter::appendRequire(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion)
+void Quick3DTechniqueFilter::appendRequire(QQmlListProperty<QFilterKey> *list, QFilterKey *criterion)
 {
     Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
     if (filter) {
@@ -77,7 +77,7 @@ void Quick3DTechniqueFilter::appendRequire(QQmlListProperty<QAnnotation> *list,
     }
 }
 
-QAnnotation *Quick3DTechniqueFilter::requireAt(QQmlListProperty<QAnnotation> *list, int index)
+QFilterKey *Quick3DTechniqueFilter::requireAt(QQmlListProperty<QFilterKey> *list, int index)
 {
     Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
     if (filter)
@@ -85,7 +85,7 @@ QAnnotation *Quick3DTechniqueFilter::requireAt(QQmlListProperty<QAnnotation> *li
     return 0;
 }
 
-int Quick3DTechniqueFilter::requiresCount(QQmlListProperty<QAnnotation> *list)
+int Quick3DTechniqueFilter::requiresCount(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
     if (filter)
@@ -93,11 +93,11 @@ int Quick3DTechniqueFilter::requiresCount(QQmlListProperty<QAnnotation> *list)
     return 0;
 }
 
-void Quick3DTechniqueFilter::clearRequires(QQmlListProperty<QAnnotation> *list)
+void Quick3DTechniqueFilter::clearRequires(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DTechniqueFilter *filter = qobject_cast<Quick3DTechniqueFilter *>(list->object);
     if (filter) {
-        Q_FOREACH (QAnnotation *criterion, filter->parentTechniqueFilter()->criteria())
+        Q_FOREACH (QFilterKey *criterion, filter->parentTechniqueFilter()->criteria())
             filter->parentTechniqueFilter()->removeMatch(criterion);
     }
 }
diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
index a58835d81..27d637e23 100644
--- a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
+++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h
@@ -53,7 +53,7 @@
 
 #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h>
 #include <Qt3DRender/qtechniquefilter.h>
-#include <Qt3DRender/qannotation.h>
+#include <Qt3DRender/qfilterkey.h>
 #include <Qt3DQuick/private/quick3dnode_p.h>
 #include <QQmlListProperty>
 
@@ -66,22 +66,22 @@ namespace Quick {
 class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechniqueFilter : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3DRender::QAnnotation> matchAll READ matchList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QFilterKey> matchAll READ matchList)
     Q_PROPERTY(QQmlListProperty<Qt3DRender::QParameter> parameters READ parameterList)
 
 public:
     explicit Quick3DTechniqueFilter(QObject *parent = 0);
 
-    QQmlListProperty<QAnnotation> matchList();
+    QQmlListProperty<QFilterKey> matchList();
     QQmlListProperty<QParameter> parameterList();
 
     inline QTechniqueFilter *parentTechniqueFilter() const { return qobject_cast<QTechniqueFilter*>(parent()); }
 
 private:
-    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);
+    static void appendRequire(QQmlListProperty<QFilterKey> *list, QFilterKey *criterion);
+    static QFilterKey *requireAt(QQmlListProperty<QFilterKey> *list, int index);
+    static int requiresCount(QQmlListProperty<QFilterKey> *list);
+    static void clearRequires(QQmlListProperty<QFilterKey> *list);
 
     static void appendParameter(QQmlListProperty<QParameter> *list, QParameter *param);
     static QParameter *parameterAt(QQmlListProperty<QParameter> *list, int index);