QAnnotation changes

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

6 files changed, 21 insertions, 21 deletions

diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
index fa629dd73..5981de9ed 100644
--- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
@@ -77,15 +77,15 @@ void DeferredRenderer::setGBuffer(Qt3DRender::QRenderTarget *gBuffer)
     m_gBufferTargetSelector->setTarget(gBuffer);
 }
 
-void DeferredRenderer::setGeometryPassCriteria(QList<Qt3DRender::QAnnotation *> criteria)
+void DeferredRenderer::setGeometryPassCriteria(QList<Qt3DRender::QFilterKey *> criteria)
 {
-    Q_FOREACH (Qt3DRender::QAnnotation *c, criteria)
+    Q_FOREACH (Qt3DRender::QFilterKey *c, criteria)
         m_geometryPassFilter->addInclude(c);
 }
 
-void DeferredRenderer::setFinalPassCriteria(QList<Qt3DRender::QAnnotation *> criteria)
+void DeferredRenderer::setFinalPassCriteria(QList<Qt3DRender::QFilterKey *> criteria)
 {
-    Q_FOREACH (Qt3DRender::QAnnotation *c, criteria)
+    Q_FOREACH (Qt3DRender::QFilterKey *c, criteria)
         c->setParent(m_finalPassFilter);
 }
 
diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
index 71a0f9dbd..8f37d4b5a 100644
--- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.h
@@ -58,7 +58,7 @@
 #include <Qt3DRender/QRenderTargetSelector>
 #include <Qt3DRender/QRenderSurfaceSelector>
 #include <Qt3DRender/QCameraSelector>
-#include <Qt3DRender/QAnnotation>
+#include <Qt3DRender/QFilterKey>
 
 class DeferredRenderer : public Qt3DRender::QViewport
 {
@@ -67,8 +67,8 @@ public:
 
     void setSceneCamera(Qt3DCore::QEntity *camera);
     void setGBuffer(Qt3DRender::QRenderTarget *gBuffer);
-    void setGeometryPassCriteria(QList<Qt3DRender::QAnnotation *> criteria);
-    void setFinalPassCriteria(QList<Qt3DRender::QAnnotation *> criteria);
+    void setGeometryPassCriteria(QList<Qt3DRender::QFilterKey *> criteria);
+    void setFinalPassCriteria(QList<Qt3DRender::QFilterKey *> criteria);
     void setGBufferLayers(const QStringList &layerName);
     void setScreenQuadLayers(const QStringList &layerName);
 
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
index db51058d9..63c821caa 100644
--- a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
@@ -60,7 +60,7 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent)
     , m_gl2Technique(new Qt3DRender::QTechnique())
     , m_gl2Pass(new Qt3DRender::QRenderPass())
     , m_gl3Pass(new Qt3DRender::QRenderPass())
-    , m_passCriterion(new Qt3DRender::QAnnotation(this))
+    , m_passCriterion(new Qt3DRender::QFilterKey(this))
 {
     m_gl3Technique->graphicsApiFilter()->setApi(Qt3DRender::QGraphicsApiFilter::OpenGL);
     m_gl3Technique->graphicsApiFilter()->setMajorVersion(3);
@@ -79,7 +79,7 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent)
     gl3Shader->setVertexShaderCode(gl3Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl3.vert"))));
     gl3Shader->setFragmentShaderCode(gl3Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl3.frag"))));
 
-    m_gl3Pass->addAnnotation(m_passCriterion);
+    m_gl3Pass->addFilterKey(m_passCriterion);
     m_gl3Pass->setShaderProgram(gl3Shader);
     m_gl3Technique->addRenderPass(m_gl3Pass);
 
@@ -87,7 +87,7 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent)
     gl2Shader->setVertexShaderCode(gl2Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl2.vert"))));
     gl2Shader->setFragmentShaderCode(gl2Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl2.frag"))));
 
-    m_gl2Pass->addAnnotation(m_passCriterion);
+    m_gl2Pass->addFilterKey(m_passCriterion);
     m_gl2Pass->setShaderProgram(gl2Shader);
     m_gl2Technique->addRenderPass(m_gl2Pass);
 
@@ -95,7 +95,7 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent)
     addTechnique(m_gl2Technique);
 }
 
-QList<Qt3DRender::QAnnotation *> FinalEffect::passCriteria() const
+QList<Qt3DRender::QFilterKey *> FinalEffect::passCriteria() const
 {
-    return QList<Qt3DRender::QAnnotation *>() << m_passCriterion;
+    return QList<Qt3DRender::QFilterKey *>() << m_passCriterion;
 }
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.h b/examples/qt3d/deferred-renderer-cpp/finaleffect.h
index 95f2917cc..69a1b126c 100644
--- a/examples/qt3d/deferred-renderer-cpp/finaleffect.h
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.h
@@ -59,7 +59,7 @@ class FinalEffect : public Qt3DRender::QEffect
 public:
     explicit FinalEffect(Qt3DCore::QNode *parent = 0);
 
-    QList<Qt3DRender::QAnnotation *> passCriteria() const;
+    QList<Qt3DRender::QFilterKey *> passCriteria() const;
     inline Qt3DRender::QTechnique *gl3Technique() const { return m_gl3Technique; }
     inline Qt3DRender::QTechnique *gl2Technique() const { return m_gl2Technique; }
 
@@ -68,7 +68,7 @@ private :
     Qt3DRender::QTechnique *m_gl2Technique;
     Qt3DRender::QRenderPass *m_gl2Pass;
     Qt3DRender::QRenderPass *m_gl3Pass;
-    Qt3DRender::QAnnotation *m_passCriterion;
+    Qt3DRender::QFilterKey *m_passCriterion;
 };
 
 #endif // FINALEFFECT_H
diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
index 047e43f32..bdb6ea76e 100644
--- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
@@ -60,7 +60,7 @@ SceneEffect::SceneEffect(Qt3DCore::QNode *parent)
     , m_gl2Technique(new Qt3DRender::QTechnique())
     , m_gl2Pass(new Qt3DRender::QRenderPass())
     , m_gl3Pass(new Qt3DRender::QRenderPass())
-    , m_passCriterion(new Qt3DRender::QAnnotation(this))
+    , m_passCriterion(new Qt3DRender::QFilterKey(this))
 {
 
     m_gl3Technique->graphicsApiFilter()->setProfile(Qt3DRender::QGraphicsApiFilter::NoProfile);
@@ -81,7 +81,7 @@ SceneEffect::SceneEffect(Qt3DCore::QNode *parent)
     gl3Shader->setVertexShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl3.vert"))));
     gl3Shader->setFragmentShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl3.frag"))));
 
-    m_gl3Pass->addAnnotation(m_passCriterion);
+    m_gl3Pass->addFilterKey(m_passCriterion);
     m_gl3Pass->setShaderProgram(gl3Shader);
     m_gl3Technique->addRenderPass(m_gl3Pass);
 
@@ -89,7 +89,7 @@ SceneEffect::SceneEffect(Qt3DCore::QNode *parent)
     gl2Shader->setVertexShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl2.vert"))));
     gl2Shader->setFragmentShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl2.frag"))));
 
-    m_gl2Pass->addAnnotation(m_passCriterion);
+    m_gl2Pass->addFilterKey(m_passCriterion);
     m_gl2Pass->setShaderProgram(gl2Shader);
     m_gl2Technique->addRenderPass(m_gl2Pass);
 
@@ -97,7 +97,7 @@ SceneEffect::SceneEffect(Qt3DCore::QNode *parent)
     addTechnique(m_gl2Technique);
 }
 
-QList<Qt3DRender::QAnnotation *> SceneEffect::passCriteria() const
+QList<Qt3DRender::QFilterKey *> SceneEffect::passCriteria() const
 {
-    return QList<Qt3DRender::QAnnotation *>() << m_passCriterion;
+    return QList<Qt3DRender::QFilterKey *>() << m_passCriterion;
 }
diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
index abae0dd62..eb361c273 100644
--- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.h
@@ -59,14 +59,14 @@ class SceneEffect : public Qt3DRender::QEffect
 public:
     explicit SceneEffect(Qt3DCore::QNode *parent = 0);
 
-    QList<Qt3DRender::QAnnotation *> passCriteria() const;
+    QList<Qt3DRender::QFilterKey *> passCriteria() const;
 
 private:
     Qt3DRender::QTechnique *m_gl3Technique;
     Qt3DRender::QTechnique *m_gl2Technique;
     Qt3DRender::QRenderPass *m_gl2Pass;
     Qt3DRender::QRenderPass *m_gl3Pass;
-    Qt3DRender::QAnnotation *m_passCriterion;
+    Qt3DRender::QFilterKey *m_passCriterion;
 };
 
 #endif // SCENEEFFECT_H