Renamed QCriterion to QAnnotation

Change-Id: I4b40120807a60873b38687ba8ce0b6c2dfd77127
Task-number: QTBUG-41534
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

22 files changed, 50 insertions, 50 deletions

diff --git a/examples/bigmodel-qml/ForwardRenderer.qml b/examples/bigmodel-qml/ForwardRenderer.qml
index e2d1537b3..160850d71 100644
--- a/examples/bigmodel-qml/ForwardRenderer.qml
+++ b/examples/bigmodel-qml/ForwardRenderer.qml
@@ -56,7 +56,7 @@ TechniqueFilter {
     property alias camera: cameraSelector.camera
 
     criteria : [
-        Criterion { name : "RenderingStyle"; value : "forward"}
+        Annotation { name : "RenderingStyle"; value : "forward"}
     ]
 
     Viewport {
diff --git a/examples/cylinder-qml/ForwardRenderer.qml b/examples/cylinder-qml/ForwardRenderer.qml
index e2d1537b3..160850d71 100644
--- a/examples/cylinder-qml/ForwardRenderer.qml
+++ b/examples/cylinder-qml/ForwardRenderer.qml
@@ -56,7 +56,7 @@ TechniqueFilter {
     property alias camera: cameraSelector.camera
 
     criteria : [
-        Criterion { name : "RenderingStyle"; value : "forward"}
+        Annotation { name : "RenderingStyle"; value : "forward"}
     ]
 
     Viewport {
diff --git a/examples/deferred-renderer-cpp/deferredrenderer.cpp b/examples/deferred-renderer-cpp/deferredrenderer.cpp
index 4d40365b6..5d328fcaf 100644
--- a/examples/deferred-renderer-cpp/deferredrenderer.cpp
+++ b/examples/deferred-renderer-cpp/deferredrenderer.cpp
@@ -67,15 +67,15 @@ void DeferredRenderer::setGBuffer(Qt3D::QRenderTarget *gBuffer)
     m_gBufferTargetSelector->setTarget(gBuffer);
 }
 
-void DeferredRenderer::setGeometryPassCriteria(QList<Qt3D::QCriterion *> criteria)
+void DeferredRenderer::setGeometryPassCriteria(QList<Qt3D::QAnnotation *> criteria)
 {
-    Q_FOREACH (Qt3D::QCriterion *c, criteria)
+    Q_FOREACH (Qt3D::QAnnotation *c, criteria)
         m_geometryPassFilter->addCriterion(c);
 }
 
-void DeferredRenderer::setFinalPassCriteria(QList<Qt3D::QCriterion *> criteria)
+void DeferredRenderer::setFinalPassCriteria(QList<Qt3D::QAnnotation *> criteria)
 {
-    Q_FOREACH (Qt3D::QCriterion *c, criteria)
+    Q_FOREACH (Qt3D::QAnnotation *c, criteria)
         c->setParent(m_finalPassFilter);
 }
 
diff --git a/examples/deferred-renderer-cpp/deferredrenderer.h b/examples/deferred-renderer-cpp/deferredrenderer.h
index e21988857..3f8cff183 100644
--- a/examples/deferred-renderer-cpp/deferredrenderer.h
+++ b/examples/deferred-renderer-cpp/deferredrenderer.h
@@ -48,7 +48,7 @@
 #include <Qt3DRenderer/QRenderPassFilter>
 #include <Qt3DRenderer/QRenderTargetSelector>
 #include <Qt3DRenderer/QCameraSelector>
-#include <Qt3DRenderer/QCriterion>
+#include <Qt3DRenderer/QAnnotation>
 
 class DeferredRenderer : public Qt3D::QViewport
 {
@@ -57,8 +57,8 @@ public:
 
     void setSceneCamera(Qt3D::QEntity *camera);
     void setGBuffer(Qt3D::QRenderTarget *gBuffer);
-    void setGeometryPassCriteria(QList<Qt3D::QCriterion *> criteria);
-    void setFinalPassCriteria(QList<Qt3D::QCriterion *> criteria);
+    void setGeometryPassCriteria(QList<Qt3D::QAnnotation *> criteria);
+    void setFinalPassCriteria(QList<Qt3D::QAnnotation *> criteria);
     void setGBufferLayer(const QString &layerName);
     void setScreenQuadLayer(const QString &layerName);
 
diff --git a/examples/deferred-renderer-cpp/finaleffect.cpp b/examples/deferred-renderer-cpp/finaleffect.cpp
index b863a3c05..f9f6010b9 100644
--- a/examples/deferred-renderer-cpp/finaleffect.cpp
+++ b/examples/deferred-renderer-cpp/finaleffect.cpp
@@ -50,7 +50,7 @@ FinalEffect::FinalEffect(Qt3D::QNode *parent)
     , m_gl2Technique(new Qt3D::QTechnique())
     , m_gl2Pass(new Qt3D::QRenderPass())
     , m_gl3Pass(new Qt3D::QRenderPass())
-    , m_passCriterion(new Qt3D::QCriterion(this))
+    , m_passCriterion(new Qt3D::QAnnotation(this))
 {
     m_gl3Technique->openGLFilter()->setApi(Qt3D::QOpenGLFilter::Desktop);
     m_gl3Technique->openGLFilter()->setMajorVersion(3);
@@ -85,7 +85,7 @@ FinalEffect::FinalEffect(Qt3D::QNode *parent)
     addTechnique(m_gl2Technique);
 }
 
-QList<Qt3D::QCriterion *> FinalEffect::passCriteria() const
+QList<Qt3D::QAnnotation *> FinalEffect::passCriteria() const
 {
-    return QList<Qt3D::QCriterion *>() << m_passCriterion;
+    return QList<Qt3D::QAnnotation *>() << m_passCriterion;
 }
diff --git a/examples/deferred-renderer-cpp/finaleffect.h b/examples/deferred-renderer-cpp/finaleffect.h
index 639a297c7..79d06b6af 100644
--- a/examples/deferred-renderer-cpp/finaleffect.h
+++ b/examples/deferred-renderer-cpp/finaleffect.h
@@ -50,14 +50,14 @@ class FinalEffect : public Qt3D::QEffect
 public:
     explicit FinalEffect(Qt3D::QNode *parent = 0);
 
-    QList<Qt3D::QCriterion *> passCriteria() const;
+    QList<Qt3D::QAnnotation *> passCriteria() const;
 
 private :
     Qt3D::QTechnique *m_gl3Technique;
     Qt3D::QTechnique *m_gl2Technique;
     Qt3D::QRenderPass *m_gl2Pass;
     Qt3D::QRenderPass *m_gl3Pass;
-    Qt3D::QCriterion *m_passCriterion;
+    Qt3D::QAnnotation *m_passCriterion;
 };
 
 #endif // FINALEFFECT_H
diff --git a/examples/deferred-renderer-cpp/sceneeffect.cpp b/examples/deferred-renderer-cpp/sceneeffect.cpp
index 1b2682ec1..f67c070e7 100644
--- a/examples/deferred-renderer-cpp/sceneeffect.cpp
+++ b/examples/deferred-renderer-cpp/sceneeffect.cpp
@@ -50,7 +50,7 @@ SceneEffect::SceneEffect(Qt3D::QNode *parent)
     , m_gl2Technique(new Qt3D::QTechnique())
     , m_gl2Pass(new Qt3D::QRenderPass())
     , m_gl3Pass(new Qt3D::QRenderPass())
-    , m_passCriterion(new Qt3D::QCriterion(this))
+    , m_passCriterion(new Qt3D::QAnnotation(this))
 {
 
     m_gl3Technique->openGLFilter()->setProfile(Qt3D::QOpenGLFilter::None);
@@ -87,7 +87,7 @@ SceneEffect::SceneEffect(Qt3D::QNode *parent)
     addTechnique(m_gl2Technique);
 }
 
-QList<Qt3D::QCriterion *> SceneEffect::passCriteria() const
+QList<Qt3D::QAnnotation *> SceneEffect::passCriteria() const
 {
-    return QList<Qt3D::QCriterion *>() << m_passCriterion;
+    return QList<Qt3D::QAnnotation *>() << m_passCriterion;
 }
diff --git a/examples/deferred-renderer-cpp/sceneeffect.h b/examples/deferred-renderer-cpp/sceneeffect.h
index dd07dabb9..37b98cfdf 100644
--- a/examples/deferred-renderer-cpp/sceneeffect.h
+++ b/examples/deferred-renderer-cpp/sceneeffect.h
@@ -50,14 +50,14 @@ class SceneEffect : public Qt3D::QEffect
 public:
     explicit SceneEffect(Qt3D::QNode *parent = 0);
 
-    QList<Qt3D::QCriterion *> passCriteria() const;
+    QList<Qt3D::QAnnotation *> passCriteria() const;
 
 private:
     Qt3D::QTechnique *m_gl3Technique;
     Qt3D::QTechnique *m_gl2Technique;
     Qt3D::QRenderPass *m_gl2Pass;
     Qt3D::QRenderPass *m_gl3Pass;
-    Qt3D::QCriterion *m_passCriterion;
+    Qt3D::QAnnotation *m_passCriterion;
 };
 
 #endif // SCENEEFFECT_H
diff --git a/examples/deferred-renderer-qml/DeferredRenderer.qml b/examples/deferred-renderer-qml/DeferredRenderer.qml
index 559c2ee53..810f0dce9 100644
--- a/examples/deferred-renderer-qml/DeferredRenderer.qml
+++ b/examples/deferred-renderer-qml/DeferredRenderer.qml
@@ -59,7 +59,7 @@ Viewport {
 
                 RenderPassFilter {
                     id : geometryPass
-                    criteria : Criterion { name : "pass"; value : "geometry" }
+                    criteria : Annotation { name : "pass"; value : "geometry" }
 
                     CameraSelector {
                         id : sceneCameraSelector
@@ -77,7 +77,7 @@ Viewport {
 
             RenderPassFilter {
                 id : finalPass
-                criteria : Criterion { name : "pass"; value : "final" }
+                criteria : Annotation { name : "pass"; value : "final" }
             }
 
         }
diff --git a/examples/deferred-renderer-qml/FinalEffect.qml b/examples/deferred-renderer-qml/FinalEffect.qml
index 9c5df1199..b2d45e0d7 100644
--- a/examples/deferred-renderer-qml/FinalEffect.qml
+++ b/examples/deferred-renderer-qml/FinalEffect.qml
@@ -48,7 +48,7 @@ Effect {
         Technique {
             openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
             renderPasses : RenderPass {
-                criteria : Criterion { name : "pass"; value : "final" }
+                criteria : Annotation { name : "pass"; value : "final" }
                 shaderProgram : ShaderProgram {
                     id : finalShaderGL3
                     vertexShaderCode:
@@ -106,7 +106,7 @@ Effect {
         Technique {
             openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.None; minorVersion : 0; majorVersion : 2 }
             renderPasses : RenderPass {
-                criteria : Criterion { name : "pass"; value : "final" }
+                criteria : Annotation { name : "pass"; value : "final" }
                 shaderProgram : ShaderProgram {
                     id : finalShaderGL2
                     vertexShaderCode:
diff --git a/examples/deferred-renderer-qml/SceneEffect.qml b/examples/deferred-renderer-qml/SceneEffect.qml
index 527422dfc..88cfa4873 100644
--- a/examples/deferred-renderer-qml/SceneEffect.qml
+++ b/examples/deferred-renderer-qml/SceneEffect.qml
@@ -49,7 +49,7 @@ Effect {
         Technique {
             openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
             renderPasses : RenderPass {
-                criteria : Criterion { name : "pass"; value : "geometry" }
+                criteria : Annotation { name : "pass"; value : "geometry" }
                 shaderProgram : ShaderProgram {
                     id : sceneShaderGL3
                     vertexShaderCode:
@@ -100,7 +100,7 @@ Effect {
         Technique {
             openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 0; majorVersion : 2 }
             renderPasses : RenderPass {
-                criteria : Criterion { name : "pass"; value : "geometry" }
+                criteria : Annotation { name : "pass"; value : "geometry" }
                 shaderProgram : ShaderProgram {
                     id : sceneShaderGL2
                     vertexShaderCode:
diff --git a/examples/playground-qml/ForwardRenderer.qml b/examples/playground-qml/ForwardRenderer.qml
index 04568cb1d..fe8b187a1 100644
--- a/examples/playground-qml/ForwardRenderer.qml
+++ b/examples/playground-qml/ForwardRenderer.qml
@@ -62,8 +62,8 @@ TechniqueFilter {
     property alias colorAttachmentTexture : defaultColorAttachment.texture
 
     criteria : [
-        Criterion { name : "RenderingStyle"; value : "forward";},
-        Criterion { name : "Enabled"; value : true;}
+        Annotation { name : "RenderingStyle"; value : "forward";},
+        Annotation { name : "Enabled"; value : true;}
     ]
 
     ClearBuffer {
@@ -84,7 +84,7 @@ TechniqueFilter {
                     LayerFilter {
                         id : layerFilter
                         objectName : "layerFilter"
-                        RenderPassFilter { criteria : [Criterion {name : "Name"; value : "TextureLighting";}] }
+                        RenderPassFilter { criteria : [Annotation {name : "Name"; value : "TextureLighting";}] }
                     }
                 }
             }
@@ -108,10 +108,10 @@ TechniqueFilter {
                         }
                     ]
                 }
-                RenderPassFilter { criteria : [Criterion {name : "Name"; value : "Texture";}] }
-                RenderPassFilter { criteria : [Criterion {name : "Name"; value : "Lighting";}] }
+                RenderPassFilter { criteria : [Annotation {name : "Name"; value : "Texture";}] }
+                RenderPassFilter { criteria : [Annotation {name : "Name"; value : "Lighting";}] }
             }
-            RenderPassFilter { criteria : [Criterion {name : "Name"; value : "Final";}] }
+            RenderPassFilter { criteria : [Annotation {name : "Name"; value : "Final";}] }
         }
     }
 }
diff --git a/examples/playground-qml/main.qml b/examples/playground-qml/main.qml
index 4074ba7c3..8eaffb330 100644
--- a/examples/playground-qml/main.qml
+++ b/examples/playground-qml/main.qml
@@ -257,13 +257,13 @@ Entity {
                 techniques : [
                     Technique {
                         criteria : [
-                            Criterion { name : "RenderingStyle"; value : "forward"},
-                            Criterion { name : "Enabled"; value : true}
+                            Annotation { name : "RenderingStyle"; value : "forward"},
+                            Annotation { name : "Enabled"; value : true}
                         ]
                         openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
                         renderPasses : [
                             RenderPass {
-                                criteria : [Criterion {name : "Name"; value : "TextureLighting" }]
+                                criteria : [Annotation {name : "Name"; value : "TextureLighting" }]
                                 bindings : [ // Add only the bindings needed for a shader
                                     ParameterMapper {parameterName: "vertexTexCoord"; shaderVariableName: "texCoord0"; bindingType: ParameterMapper.Attribute},
                                     ParameterMapper {parameterName: "tex"; shaderVariableName: "texture"; bindingType: ParameterMapper.Uniform},
@@ -326,7 +326,7 @@ Entity {
                                 }
                             },
                             RenderPass {
-                                criteria : [Criterion {name : "Name"; value : "Texture" }]
+                                criteria : [Annotation {name : "Name"; value : "Texture" }]
                                 shaderProgram : ShaderProgram {
                                     vertexShaderCode : "
                                     #version 140
@@ -356,7 +356,7 @@ Entity {
                                 }
                             },
                             RenderPass {
-                                criteria : [Criterion {name : "Name"; value : "Lighting" }]
+                                criteria : [Annotation {name : "Name"; value : "Lighting" }]
                                 renderStates : [BlendState {srcRGB: BlendState.One; dstRGB : BlendState.One},
                                               BlendEquation {mode: BlendEquation.FuncAdd},
                                               CullFace { mode : CullFace.Back },
@@ -413,7 +413,7 @@ Entity {
                                 }
                             },
                             RenderPass {
-                                criteria : Criterion {name : "Name"; value : "Final" }
+                                criteria : Annotation {name : "Name"; value : "Final" }
                                 shaderProgram : ShaderProgram {
                                     vertexShaderCode: "
                                     #version 140
@@ -485,8 +485,8 @@ Entity {
                     Technique {
                         openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
                         criteria : [
-                            Criterion { name : "RenderingStyle"; value : "forward"},
-                            Criterion { name : "Enabled"; value : timer.test; onValueChanged: console.log("VALUE " + value)}
+                            Annotation { name : "RenderingStyle"; value : "forward"},
+                            Annotation { name : "Enabled"; value : timer.test; onValueChanged: console.log("VALUE " + value)}
                         ]
 
                         parameters : [Parameter { name : "lightPos"; value : Qt.vector4d(10.0, 10.0, 0.0, 1.0);}]
diff --git a/examples/rollerball/AdsEffect.qml b/examples/rollerball/AdsEffect.qml
index 56000811e..d4c10d132 100644
--- a/examples/rollerball/AdsEffect.qml
+++ b/examples/rollerball/AdsEffect.qml
@@ -76,7 +76,7 @@ Effect {
                 minorVersion: 1
             }
 
-            criteria: [ Criterion { name : "renderingStyle"; value : "forward" } ]
+            criteria: [ Annotation { name : "renderingStyle"; value : "forward" } ]
 
             parameters: [
                 Parameter { name: "lightPosition";  value: Qt.vector4d( 0.0, 0.0, 0.0, 1.0 ) },
diff --git a/examples/rollerball/ForwardRenderer.qml b/examples/rollerball/ForwardRenderer.qml
index 7a100bf4d..ac8365f85 100644
--- a/examples/rollerball/ForwardRenderer.qml
+++ b/examples/rollerball/ForwardRenderer.qml
@@ -50,7 +50,7 @@ TechniqueFilter {
     property alias camera: cameraSelector.camera
 
     // Select the forward rendering Technique of any used Effect
-    criteria: [ Criterion { name: "renderingStyle"; value: "forward" } ]
+    criteria: [ Annotation { name: "renderingStyle"; value: "forward" } ]
 
     // Use the whole viewport
     Viewport {
diff --git a/examples/shadow-map-qml/AdsEffect.qml b/examples/shadow-map-qml/AdsEffect.qml
index c57645ddf..7bf1b577d 100644
--- a/examples/shadow-map-qml/AdsEffect.qml
+++ b/examples/shadow-map-qml/AdsEffect.qml
@@ -82,7 +82,7 @@ Effect {
 
             renderPasses: [
                 RenderPass {
-                    criteria: [ Criterion { name: "pass"; value: "shadowmap" } ]
+                    criteria: [ Annotation { name: "pass"; value: "shadowmap" } ]
 
                     shaderProgram: ShaderProgram {
                         vertexShaderSourceFile:   ":/shaders/shadowmap.vert"
@@ -96,7 +96,7 @@ Effect {
                 },
 
                 RenderPass {
-                    criteria: [ Criterion { name : "pass"; value : "forward" } ]
+                    criteria: [ Annotation { name : "pass"; value : "forward" } ]
 
                     // The bindings property allows us to map from names of parameters (uniforms or vertex attributes)
                     // within a shader to more friendly names in QML. By default the parameter names are exposed from
diff --git a/examples/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/shadow-map-qml/ShadowMapFrameGraph.qml
index b3f2c5d9a..7164c0ffc 100644
--- a/examples/shadow-map-qml/ShadowMapFrameGraph.qml
+++ b/examples/shadow-map-qml/ShadowMapFrameGraph.qml
@@ -62,7 +62,7 @@ FrameGraph {
         clearColor: Qt.rgba(0.0, 0.4, 0.7, 1.0)
 
         RenderPassFilter {
-            criteria: [ Criterion { name: "pass"; value: "shadowmap" } ]
+            criteria: [ Annotation { name: "pass"; value: "shadowmap" } ]
 
             RenderTargetSelector {
                 target: RenderTarget {
@@ -96,7 +96,7 @@ FrameGraph {
         }
 
         RenderPassFilter {
-            criteria: [ Criterion { name: "pass"; value: "forward" } ]
+            criteria: [ Annotation { name: "pass"; value: "forward" } ]
 
             ClearBuffer {
                 buffers: ClearBuffer.ColorDepthBuffer
diff --git a/examples/tessellation-modes/ForwardRenderer.qml b/examples/tessellation-modes/ForwardRenderer.qml
index 7a100bf4d..ac8365f85 100644
--- a/examples/tessellation-modes/ForwardRenderer.qml
+++ b/examples/tessellation-modes/ForwardRenderer.qml
@@ -50,7 +50,7 @@ TechniqueFilter {
     property alias camera: cameraSelector.camera
 
     // Select the forward rendering Technique of any used Effect
-    criteria: [ Criterion { name: "renderingStyle"; value: "forward" } ]
+    criteria: [ Annotation { name: "renderingStyle"; value: "forward" } ]
 
     // Use the whole viewport
     Viewport {
diff --git a/examples/tessellation-modes/TessellatedWireframeEffect.qml b/examples/tessellation-modes/TessellatedWireframeEffect.qml
index 6ef82580e..eb33bbb44 100644
--- a/examples/tessellation-modes/TessellatedWireframeEffect.qml
+++ b/examples/tessellation-modes/TessellatedWireframeEffect.qml
@@ -76,7 +76,7 @@ Effect {
                 minorVersion: 0
             }
 
-            criteria: [ Criterion { name: "renderingStyle"; value: "forward" } ]
+            criteria: [ Annotation { name: "renderingStyle"; value: "forward" } ]
 
             parameters: [
                 Parameter { name: "light.position"; value: Qt.vector4d(0.0, 0.0, 0.0, 1.0) },
diff --git a/examples/torus-qml/ForwardRenderer.qml b/examples/torus-qml/ForwardRenderer.qml
index e2d1537b3..160850d71 100644
--- a/examples/torus-qml/ForwardRenderer.qml
+++ b/examples/torus-qml/ForwardRenderer.qml
@@ -56,7 +56,7 @@ TechniqueFilter {
     property alias camera: cameraSelector.camera
 
     criteria : [
-        Criterion { name : "RenderingStyle"; value : "forward"}
+        Annotation { name : "RenderingStyle"; value : "forward"}
     ]
 
     Viewport {
diff --git a/examples/wireframe/ForwardRenderer.qml b/examples/wireframe/ForwardRenderer.qml
index 7a100bf4d..ac8365f85 100644
--- a/examples/wireframe/ForwardRenderer.qml
+++ b/examples/wireframe/ForwardRenderer.qml
@@ -50,7 +50,7 @@ TechniqueFilter {
     property alias camera: cameraSelector.camera
 
     // Select the forward rendering Technique of any used Effect
-    criteria: [ Criterion { name: "renderingStyle"; value: "forward" } ]
+    criteria: [ Annotation { name: "renderingStyle"; value: "forward" } ]
 
     // Use the whole viewport
     Viewport {
diff --git a/examples/wireframe/WireframeEffect.qml b/examples/wireframe/WireframeEffect.qml
index 2b31aa603..4ad5b63fb 100644
--- a/examples/wireframe/WireframeEffect.qml
+++ b/examples/wireframe/WireframeEffect.qml
@@ -76,7 +76,7 @@ Effect {
                 minorVersion: 1
             }
 
-            criteria: [ Criterion { name : "renderingStyle"; value : "forward" } ]
+            criteria: [ Annotation { name : "renderingStyle"; value : "forward" } ]
 
             parameters: [
                 Parameter { name: "light.position"; value: Qt.vector4d(0.0, 0.0, 0.0, 1.0) },