QTechnique renaming

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

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

12 files changed, 38 insertions, 38 deletions

diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml
index b43340a3f..4efb53e49 100644
--- a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml
@@ -93,7 +93,7 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -105,7 +105,7 @@ Material {
 
             // OpenGL 2.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -117,7 +117,7 @@ Material {
 
             // OpenGL ES 2
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
index c942aa0ba..b92fb3137 100644
--- a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
@@ -107,7 +107,7 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -119,7 +119,7 @@ Material {
 
             // OpenGL 2.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -131,7 +131,7 @@ Material {
 
             // OpenGL ES 2
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml
index eef76c7ee..dc0060151 100644
--- a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml
@@ -83,7 +83,7 @@ Material {
         techniques: [
             // GL 3 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -97,7 +97,7 @@ Material {
 
             // GL 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -111,7 +111,7 @@ Material {
 
             // ES 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
index 9fe945a91..1675ec894 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml
@@ -111,7 +111,7 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -123,7 +123,7 @@ Material {
 
             // OpenGL 2.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -135,7 +135,7 @@ Material {
 
             // OpenGL ES 2
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml
index ad3610b3a..53872b842 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml
@@ -109,7 +109,7 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -121,7 +121,7 @@ Material {
 
             // OpenGL 2.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -133,7 +133,7 @@ Material {
 
             // OpenGL ES 2
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
index 895f83796..e07dc6fc5 100644
--- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml
@@ -122,7 +122,7 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -134,7 +134,7 @@ Material {
 
             // OpenGL 2.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -146,7 +146,7 @@ Material {
 
             // OpenGL ES 2
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml
index 0a3d925ec..7a04f56dd 100644
--- a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml
@@ -66,7 +66,7 @@ Material {
         techniques: [
             // GL 3 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -80,7 +80,7 @@ Material {
 
             // GL 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -94,7 +94,7 @@ Material {
 
             // ES 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml
index 750570727..fd0be8be1 100644
--- a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml
@@ -80,7 +80,7 @@ Material {
         techniques: [
             // GL 3 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -102,7 +102,7 @@ Material {
 
             // GL 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -124,7 +124,7 @@ Material {
 
             // ES 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml
index bb5ac216e..f7b72e4b0 100644
--- a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml
@@ -78,7 +78,7 @@ Material {
         techniques: [
             // GL 3 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -92,7 +92,7 @@ Material {
 
             // GL 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.NoProfile
@@ -106,7 +106,7 @@ Material {
 
             // ES 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
index 4d5b77f2b..372a4ee62 100644
--- a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
+++ b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml
@@ -99,7 +99,7 @@ Entity {
             techniques: [
                 // GL3 Technique
                 Technique {
-                    annotations: [ forward ]
+                    filterKeys: [ forward ]
                     graphicsApiFilter {
                         api: GraphicsApiFilter.OpenGL
                         profile: GraphicsApiFilter.CoreProfile
@@ -116,7 +116,7 @@ Entity {
                     }
                 },
                 Technique {
-                    annotations: [ forward ]
+                    filterKeys: [ forward ]
                     graphicsApiFilter {
                         api: GraphicsApiFilter.OpenGL
                         profile: GraphicsApiFilter.NoProfile
@@ -132,7 +132,7 @@ Entity {
                     }
                 },
                 Technique {
-                    annotations: [ forward ]
+                    filterKeys: [ forward ]
                     graphicsApiFilter {
                         api: GraphicsApiFilter.OpenGLES
                         profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
index e10d2d57e..80de438e0 100644
--- a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml
@@ -82,7 +82,7 @@ Material {
         techniques: [
             // OpenGL 3.1
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     profile: GraphicsApiFilter.CoreProfile
@@ -96,7 +96,7 @@ Material {
 
             // GL 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGL
                     majorVersion: 2
@@ -109,7 +109,7 @@ Material {
 
             // ES 2 Technique
             Technique {
-                annotations: [ forward ]
+                filterKeys: [ forward ]
                 graphicsApiFilter {
                     api: GraphicsApiFilter.OpenGLES
                     profile: GraphicsApiFilter.NoProfile
diff --git a/src/quick3d/quick3drender/items/quick3dtechnique.cpp b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
index 00d5e8a6b..6c817d631 100644
--- a/src/quick3d/quick3drender/items/quick3dtechnique.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
@@ -97,7 +97,7 @@ void Quick3DTechnique::appendRenderPass(QQmlListProperty<QRenderPass> *list, QRe
 {
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
     if (technique) {
-        technique->parentTechnique()->addPass(renderPass);
+        technique->parentTechnique()->addRenderPass(renderPass);
     }
 }
 
@@ -122,7 +122,7 @@ void Quick3DTechnique::clearRenderPasses(QQmlListProperty<QRenderPass> *list)
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
     if (technique) {
         Q_FOREACH (QRenderPass *pass, technique->parentTechnique()->renderPasses())
-            technique->parentTechnique()->removePass(pass);
+            technique->parentTechnique()->removeRenderPass(pass);
     }
 }
 
@@ -149,7 +149,7 @@ QAnnotation *Quick3DTechnique::annotationAt(QQmlListProperty<QAnnotation> *list,
 {
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
     if (technique)
-        return technique->parentTechnique()->annotations().at(index);
+        return technique->parentTechnique()->filterKeys().at(index);
     return 0;
 }
 
@@ -157,7 +157,7 @@ int Quick3DTechnique::annotationCount(QQmlListProperty<QAnnotation> *list)
 {
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
     if (technique)
-        return technique->parentTechnique()->annotations().size();
+        return technique->parentTechnique()->filterKeys().size();
     return 0;
 }
 
@@ -165,7 +165,7 @@ void Quick3DTechnique::clearAnnotationList(QQmlListProperty<QAnnotation> *list)
 {
     Quick3DTechnique *technique = qobject_cast<Quick3DTechnique *>(list->object);
     if (technique) {
-        Q_FOREACH (QAnnotation *a, technique->parentTechnique()->annotations())
+        Q_FOREACH (QAnnotation *a, technique->parentTechnique()->filterKeys())
             technique->parentTechnique()->removeAnnotation(a);
     }
 }