QTechnique renaming

annotations -> filterKeys
addPass -> addRenderPass
removePass -> removeRenderPass

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

8 files changed, 11 insertions, 11 deletions

diff --git a/examples/qt3d/bigscene-instanced-qml/main.qml b/examples/qt3d/bigscene-instanced-qml/main.qml
index cb0627410..ee1c05b7a 100644
--- a/examples/qt3d/bigscene-instanced-qml/main.qml
+++ b/examples/qt3d/bigscene-instanced-qml/main.qml
@@ -93,7 +93,7 @@ Entity {
                     minorVersion: 2
                     majorVersion: 3
                 }
-                annotations: Annotation { name: "renderingStyle"; value: "forward" }
+                filterKeys: Annotation { name: "renderingStyle"; value: "forward" }
                 renderPasses: RenderPass {
                     shaderProgram: ShaderProgram {
                         vertexShaderCode: loadSource("qrc:/instanced.vert")
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
index f85990a28..db51058d9 100644
--- a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
@@ -81,7 +81,7 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent)
 
     m_gl3Pass->addAnnotation(m_passCriterion);
     m_gl3Pass->setShaderProgram(gl3Shader);
-    m_gl3Technique->addPass(m_gl3Pass);
+    m_gl3Technique->addRenderPass(m_gl3Pass);
 
     Qt3DRender::QShaderProgram *gl2Shader = new Qt3DRender::QShaderProgram();
     gl2Shader->setVertexShaderCode(gl2Shader->loadSource(QUrl(QStringLiteral("qrc:/final_gl2.vert"))));
@@ -89,7 +89,7 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent)
 
     m_gl2Pass->addAnnotation(m_passCriterion);
     m_gl2Pass->setShaderProgram(gl2Shader);
-    m_gl2Technique->addPass(m_gl2Pass);
+    m_gl2Technique->addRenderPass(m_gl2Pass);
 
     addTechnique(m_gl3Technique);
     addTechnique(m_gl2Technique);
diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
index fc2b63578..047e43f32 100644
--- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
@@ -83,7 +83,7 @@ SceneEffect::SceneEffect(Qt3DCore::QNode *parent)
 
     m_gl3Pass->addAnnotation(m_passCriterion);
     m_gl3Pass->setShaderProgram(gl3Shader);
-    m_gl3Technique->addPass(m_gl3Pass);
+    m_gl3Technique->addRenderPass(m_gl3Pass);
 
     Qt3DRender::QShaderProgram *gl2Shader = new Qt3DRender::QShaderProgram();
     gl2Shader->setVertexShaderCode(Qt3DRender::QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/geometry_gl2.vert"))));
@@ -91,7 +91,7 @@ SceneEffect::SceneEffect(Qt3DCore::QNode *parent)
 
     m_gl2Pass->addAnnotation(m_passCriterion);
     m_gl2Pass->setShaderProgram(gl2Shader);
-    m_gl2Technique->addPass(m_gl2Pass);
+    m_gl2Technique->addRenderPass(m_gl2Pass);
 
     addTechnique(m_gl3Technique);
     addTechnique(m_gl2Technique);
diff --git a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
index 5d4841c2a..dee5c5fc6 100644
--- a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
+++ b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
@@ -79,7 +79,7 @@ Effect {
                 minorVersion: 0
             }
 
-            annotations: [ Annotation { name: "renderingStyle"; value: "forward" } ]
+            filterKeys: [ 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/qt3d/transparency-qml/main.qml b/examples/qt3d/transparency-qml/main.qml
index 6a37ab1b8..61792cc0f 100644
--- a/examples/qt3d/transparency-qml/main.qml
+++ b/examples/qt3d/transparency-qml/main.qml
@@ -161,7 +161,7 @@ Entity {
             techniques: [
                 Technique
                 {
-                    annotations: forward
+                    filterKeys: forward
                     graphicsApiFilter {
                         api: GraphicsApiFilter.OpenGL
                         profile: GraphicsApiFilter.NoProfile
diff --git a/examples/qt3d/wave/BackgroundEffect.qml b/examples/qt3d/wave/BackgroundEffect.qml
index a9442e976..587af815d 100644
--- a/examples/qt3d/wave/BackgroundEffect.qml
+++ b/examples/qt3d/wave/BackgroundEffect.qml
@@ -63,7 +63,7 @@ Effect {
                 minorVersion: 1
             }
 
-            annotations: Annotation { name: "renderingStyle"; value: "forward" }
+            filterKeys: Annotation { name: "renderingStyle"; value: "forward" }
 
             renderPasses: [
                 RenderPass {
diff --git a/examples/qt3d/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml
index 463bc0cd2..9c3705c0c 100644
--- a/examples/qt3d/wave/WaveEffect.qml
+++ b/examples/qt3d/wave/WaveEffect.qml
@@ -78,9 +78,9 @@ Effect {
                 minorVersion: 2
             }
 
-            annotations: [ Annotation { name: "renderingStyle"; value: "forward" } ]
+            filterKeys: [ Annotation { name: "renderingStyle"; value: "forward" } ]
 
-            parameters: [
+            uniforms: [
                 Parameter { name: "light.position"; value: Qt.vector4d( 0.0, 0.0, 0.0, 1.0 ) },
                 Parameter { name: "light.intensity"; value: Qt.vector3d( 1.0, 1.0, 1.0 ) },
                 Parameter { name: "line.width"; value: 0.8 },
diff --git a/examples/qt3d/wireframe/WireframeEffect.qml b/examples/qt3d/wireframe/WireframeEffect.qml
index 4caa6e735..b8a5dfc94 100644
--- a/examples/qt3d/wireframe/WireframeEffect.qml
+++ b/examples/qt3d/wireframe/WireframeEffect.qml
@@ -70,7 +70,7 @@ Effect {
                 minorVersion: 1
             }
 
-            annotations: [ Annotation { name: "renderingStyle"; value: "forward" } ]
+            filterKeys: [ Annotation { name: "renderingStyle"; value: "forward" } ]
 
             parameters: [
                 Parameter { name: "light.position"; value: Qt.vector4d( 0.0, 0.0, 0.0, 1.0 ) },