Class QRenderPassFilter renaming

includes -> matchAny
addInclude -> addMatch
removeInclude -> removeMatch

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

12 files changed, 47 insertions, 48 deletions

diff --git a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
index 69ec41598..74eb8eae9 100644
--- a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
+++ b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml
@@ -78,7 +78,7 @@ Viewport {
                     ClearBuffers {
                         buffers: ClearBuffers.ColorDepthBuffer
                         RenderPassFilter {
-                            includes: FilterKey { name: "pass"; value: "material" }
+                            matchAny: FilterKey { name: "pass"; value: "material" }
                         }
                     }
                 }
@@ -113,7 +113,7 @@ Viewport {
                         LayerFilter {
                             layers: "content"
                             RenderPassFilter {
-                                includes: FilterKey { name: "pass"; value: "stencilFill"; }
+                                matchAny: FilterKey { name: "pass"; value: "stencilFill"; }
                             }
                         }
                     }
@@ -126,7 +126,7 @@ Viewport {
                 LayerFilter {
                     layers: "caps"
                     RenderPassFilter {
-                        includes: FilterKey { name: "pass"; value: "capping"; }
+                        matchAny: FilterKey { name: "pass"; value: "capping"; }
                     }
                 }
 
diff --git a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
index 394d30f7b..2bfac45ec 100644
--- a/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/deferredrenderer.cpp
@@ -80,7 +80,7 @@ void DeferredRenderer::setGBuffer(Qt3DRender::QRenderTarget *gBuffer)
 void DeferredRenderer::setGeometryPassCriteria(QList<Qt3DRender::QFilterKey *> criteria)
 {
     Q_FOREACH (Qt3DRender::QFilterKey *c, criteria)
-        m_geometryPassFilter->addInclude(c);
+        m_geometryPassFilter->addMatch(c);
 }
 
 void DeferredRenderer::setFinalPassCriteria(QList<Qt3DRender::QFilterKey *> criteria)
diff --git a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml
index 8b7d35009..aa0d6f78f 100644
--- a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml
+++ b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml
@@ -69,7 +69,7 @@ Viewport {
 
                     RenderPassFilter {
                         id : geometryPass
-                        includes : FilterKey { name : "pass"; value : "geometry" }
+                        matchAny : FilterKey { name : "pass"; value : "geometry" }
 
                         CameraSelector {
                             id : sceneCameraSelector
@@ -87,7 +87,7 @@ Viewport {
 
                 RenderPassFilter {
                     id : finalPass
-                    includes : FilterKey { name : "pass"; value : "final" }
+                    matchAny : FilterKey { name : "pass"; value : "final" }
                     CameraSelector {
                         camera: sceneCameraSelector.camera
                     }
diff --git a/examples/qt3d/planets-qml/PlanetFrameGraph.qml b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
index 21a44bae8..fed96964a 100644
--- a/examples/qt3d/planets-qml/PlanetFrameGraph.qml
+++ b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
@@ -66,7 +66,7 @@ RenderSettings {
             matchAll: [ FilterKey { name: "name"; value: "Desktop" } ]
 
             RenderPassFilter {
-                includes: [ FilterKey { name: "pass"; value: "shadowmap" } ]
+                matchAny: [ FilterKey { name: "pass"; value: "shadowmap" } ]
 
                 RenderTargetSelector {
                     target: RenderTarget {
@@ -106,7 +106,7 @@ RenderSettings {
         }
 
         RenderPassFilter {
-            includes: [ FilterKey { name: "pass"; value: "forward" } ]
+            matchAny: [ FilterKey { name: "pass"; value: "forward" } ]
 
             ClearBuffers {
                 buffers: ClearBuffers.ColorDepthBuffer
diff --git a/examples/qt3d/playground-qml/MyForwardRenderer.qml b/examples/qt3d/playground-qml/MyForwardRenderer.qml
index 0956d485c..8fe6bf343 100644
--- a/examples/qt3d/playground-qml/MyForwardRenderer.qml
+++ b/examples/qt3d/playground-qml/MyForwardRenderer.qml
@@ -87,9 +87,8 @@ TechniqueFilter {
 
                 LayerFilter {
                     id: layerFilter
-                    RenderPassFilter { includes: [
-                            FilterKey {name : "Name"; value : "Texture"}
-                        ] }
+                    RenderPassFilter {
+                        matchAny: [ FilterKey {name : "Name"; value : "Texture"; } ] }
                 }
             }
         }
@@ -102,7 +101,7 @@ TechniqueFilter {
         CameraSelector {
             id: detailCameraSelector
             RenderPassFilter {
-                includes: [ FilterKey { name: "Name"; value: "ColorMaterial"; } ]
+                matchAny: [ FilterKey { name: "Name"; value: "ColorMaterial"; } ]
             }
         }
     }
diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
index 893688cda..068c93764 100644
--- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
+++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
@@ -68,7 +68,7 @@ RenderSettings {
 
         RenderSurfaceSelector {
             RenderPassFilter {
-                includes: [ FilterKey { name: "pass"; value: "shadowmap" } ]
+                matchAny: [ FilterKey { name: "pass"; value: "shadowmap" } ]
 
                 RenderTargetSelector {
                     target: RenderTarget {
@@ -106,7 +106,7 @@ RenderSettings {
             }
 
         RenderPassFilter {
-            includes: [ FilterKey { name: "pass"; value: "forward" } ]
+            matchAny: [ FilterKey { name: "pass"; value: "forward" } ]
 
                 ClearBuffers {
                     buffers: ClearBuffers.ColorDepthBuffer
diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
index 73baa23c8..bbc91d605 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
@@ -74,7 +74,7 @@ void Quick3DRenderPassFilter::appendInclude(QQmlListProperty<QFilterKey> *list,
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter) {
         annotation->setParent(filter->parentRenderPassFilter());
-        filter->parentRenderPassFilter()->addInclude(annotation);
+        filter->parentRenderPassFilter()->addMatch(annotation);
     }
 }
 
@@ -82,7 +82,7 @@ QFilterKey *Quick3DRenderPassFilter::includeAt(QQmlListProperty<QFilterKey> *lis
 {
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter)
-        return filter->parentRenderPassFilter()->includes().at(index);
+        return filter->parentRenderPassFilter()->matchAny().at(index);
     return 0;
 }
 
@@ -90,7 +90,7 @@ int Quick3DRenderPassFilter::includesCount(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter)
-        return filter->parentRenderPassFilter()->includes().count();
+        return filter->parentRenderPassFilter()->matchAny().count();
     return 0;
 }
 
@@ -98,8 +98,8 @@ void Quick3DRenderPassFilter::clearIncludes(QQmlListProperty<QFilterKey> *list)
 {
     Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object);
     if (filter) {
-        Q_FOREACH (QFilterKey *criterion, filter->parentRenderPassFilter()->includes())
-            filter->parentRenderPassFilter()->removeInclude(criterion);
+        Q_FOREACH (QFilterKey *criterion, filter->parentRenderPassFilter()->matchAny())
+            filter->parentRenderPassFilter()->removeMatch(criterion);
     }
 }
 
diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp
index 15d2e1167..39ab775ba 100644
--- a/src/render/framegraph/qrenderpassfilter.cpp
+++ b/src/render/framegraph/qrenderpassfilter.cpp
@@ -66,17 +66,17 @@ QRenderPassFilter::QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent
 {
 }
 
-QList<QFilterKey *> QRenderPassFilter::includes() const
+QList<QFilterKey *> QRenderPassFilter::matchAny() const
 {
     Q_D(const QRenderPassFilter);
-    return d->m_includeList;
+    return d->m_matchList;
 }
 
-void QRenderPassFilter::addInclude(QFilterKey *keyFilter)
+void QRenderPassFilter::addMatch(QFilterKey *keyFilter)
 {
     Q_D(QRenderPassFilter);
-    if (!d->m_includeList.contains(keyFilter)) {
-        d->m_includeList.append(keyFilter);
+    if (!d->m_matchList.contains(keyFilter)) {
+        d->m_matchList.append(keyFilter);
 
         // We need to add it as a child of the current node if it has been declared inline
         // Or not previously added as a child of the current node so that
@@ -87,31 +87,31 @@ void QRenderPassFilter::addInclude(QFilterKey *keyFilter)
 
         if (d->m_changeArbiter != Q_NULLPTR) {
             QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id()));
-            propertyChange->setPropertyName("include");
+            propertyChange->setPropertyName("match");
             propertyChange->setValue(QVariant::fromValue(keyFilter->id()));
             d->notifyObservers(propertyChange);
         }
     }
 }
 
-void QRenderPassFilter::removeInclude(QFilterKey *filterKey)
+void QRenderPassFilter::removeMatch(QFilterKey *filterKey)
 {
     Q_D(QRenderPassFilter);
     if (d->m_changeArbiter != Q_NULLPTR) {
         QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id()));
-        propertyChange->setPropertyName("include");
+        propertyChange->setPropertyName("match");
         propertyChange->setValue(QVariant::fromValue(filterKey->id()));
         d->notifyObservers(propertyChange);
     }
-    d->m_includeList.removeOne(filterKey);
+    d->m_matchList.removeOne(filterKey);
 }
 
 void QRenderPassFilter::copy(const QNode *ref)
 {
     QFrameGraphNode::copy(ref);
     const QRenderPassFilter *other = static_cast<const QRenderPassFilter*>(ref);
-    Q_FOREACH (QFilterKey *c, other->d_func()->m_includeList)
-        addInclude(qobject_cast<QFilterKey *>(QNode::clone(c)));
+    Q_FOREACH (QFilterKey *c, other->d_func()->m_matchList)
+        addMatch(qobject_cast<QFilterKey *>(QNode::clone(c)));
     for (QParameter *p : other->d_func()->m_parameters)
         addParameter(qobject_cast<QParameter *>(QNode::clone(p)));
 }
diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h
index 9cac293d4..eaa0572dd 100644
--- a/src/render/framegraph/qrenderpassfilter.h
+++ b/src/render/framegraph/qrenderpassfilter.h
@@ -61,9 +61,9 @@ public:
     explicit QRenderPassFilter(Qt3DCore::QNode *parent = 0);
     ~QRenderPassFilter();
 
-    QList<QFilterKey*> includes() const;
-    void addInclude(QFilterKey*keyFilter);
-    void removeInclude(QFilterKey*criterion);
+    QList<QFilterKey*> matchAny() const;
+    void addMatch(QFilterKey*keyFilter);
+    void removeMatch(QFilterKey*criterion);
 
     void addParameter(QParameter *p);
     void removeParameter(QParameter *p);
diff --git a/src/render/framegraph/qrenderpassfilter_p.h b/src/render/framegraph/qrenderpassfilter_p.h
index 22cc2fd55..bbca70297 100644
--- a/src/render/framegraph/qrenderpassfilter_p.h
+++ b/src/render/framegraph/qrenderpassfilter_p.h
@@ -68,7 +68,7 @@ public:
 
     Q_DECLARE_PUBLIC(QRenderPassFilter)
     QString m_renderPassName;
-    QList<QFilterKey *> m_includeList;
+    QList<QFilterKey *> m_matchList;
     QList<QParameter *> m_parameters;
 };
 
diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp
index e125c79da..a36560d09 100644
--- a/src/render/framegraph/renderpassfilternode.cpp
+++ b/src/render/framegraph/renderpassfilternode.cpp
@@ -61,7 +61,7 @@ void RenderPassFilter::updateFromPeer(Qt3DCore::QNode *peer)
     m_filters.clear();
     m_parameterPack.clear();
     setEnabled(filter->isEnabled());
-    const auto criteria = filter->includes();
+    const auto criteria = filter->matchAny();
     for (QFilterKey *criterion : criteria)
         appendFilter(criterion->id());
     const auto parameters = filter->parameters();
diff --git a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
index fd429208f..7b89e99ad 100644
--- a/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
+++ b/tests/auto/render/qrenderpassfilter/tst_qrenderpassfilter.cpp
@@ -54,7 +54,7 @@ private Q_SLOTS:
     {
         QScopedPointer<Qt3DRender::QRenderPassFilter> defaultRenderPassFilter(new Qt3DRender::QRenderPassFilter);
 
-        QCOMPARE(defaultRenderPassFilter->includes().count(), 0);
+        QCOMPARE(defaultRenderPassFilter->matchAny().count(), 0);
         QCOMPARE(defaultRenderPassFilter->parameters().count(), 0);
     }
 
@@ -83,8 +83,8 @@ private Q_SLOTS:
         filterKey1->setName(QStringLiteral("hasNitroKit"));
         filterKey1->setValue(false);
         QList<Qt3DRender::QFilterKey *> filterKeys1 = QList<Qt3DRender::QFilterKey *>() << filterKey1 << filterKey2;
-        renderPassFilterWithAnnotations->addInclude(filterKey1);
-        renderPassFilterWithAnnotations->addInclude(filterKey2);
+        renderPassFilterWithAnnotations->addMatch(filterKey1);
+        renderPassFilterWithAnnotations->addMatch(filterKey2);
         QTest::newRow("renderPassFilterWithAnnotations") << renderPassFilterWithAnnotations << QList<Qt3DRender::QParameter *>() << filterKeys1;
 
         Qt3DRender::QRenderPassFilter *renderPassFilterWithParamsAndAnnotations = new Qt3DRender::QRenderPassFilter();
@@ -100,8 +100,8 @@ private Q_SLOTS:
         QList<Qt3DRender::QFilterKey *> filterKeys2 = QList<Qt3DRender::QFilterKey *>() << filterKey3 << filterKey4;
         renderPassFilterWithParamsAndAnnotations->addParameter(parameter3);
         renderPassFilterWithParamsAndAnnotations->addParameter(parameter4);
-        renderPassFilterWithParamsAndAnnotations->addInclude(filterKey3);
-        renderPassFilterWithParamsAndAnnotations->addInclude(filterKey4);
+        renderPassFilterWithParamsAndAnnotations->addMatch(filterKey3);
+        renderPassFilterWithParamsAndAnnotations->addMatch(filterKey4);
         QTest::newRow("renderPassFilterWithParamsAndAnnotations") << renderPassFilterWithParamsAndAnnotations << params2 << filterKeys2 ;
     }
 
@@ -114,7 +114,7 @@ private Q_SLOTS:
 
         // THEN
         QCOMPARE(renderPassFilter->parameters(), parameters);
-        QCOMPARE(renderPassFilter->includes(), filterKeys);
+        QCOMPARE(renderPassFilter->matchAny(), filterKeys);
 
         // WHEN
         Qt3DRender::QRenderPassFilter *clone = static_cast<Qt3DRender::QRenderPassFilter *>(QNode::clone(renderPassFilter));
@@ -123,7 +123,7 @@ private Q_SLOTS:
         QVERIFY(clone != Q_NULLPTR);
         QCOMPARE(renderPassFilter->id(), clone->id());
 
-        QCOMPARE(renderPassFilter->includes().count(), clone->includes().count());
+        QCOMPARE(renderPassFilter->matchAny().count(), clone->matchAny().count());
         QCOMPARE(renderPassFilter->parameters().count(), clone->parameters().count());
 
         for (int i = 0, m = parameters.count(); i < m; ++i) {
@@ -137,7 +137,7 @@ private Q_SLOTS:
         }
 
         for (int i = 0, m = filterKeys.count(); i < m; ++i) {
-            Qt3DRender::QFilterKey *aClone = clone->includes().at(i);
+            Qt3DRender::QFilterKey *aClone = clone->matchAny().at(i);
             Qt3DRender::QFilterKey *aOrig = filterKeys.at(i);
             QCOMPARE(aOrig->id(),aClone->id());
             QCOMPARE(aOrig->name(), aClone->name());
@@ -194,13 +194,13 @@ private Q_SLOTS:
 
         // WHEN
         Qt3DRender::QFilterKey *filterKey1 = new Qt3DRender::QFilterKey();
-        renderPassFilter->addInclude(filterKey1);
+        renderPassFilter->addMatch(filterKey1);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
         change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
-        QCOMPARE(change->propertyName(), "include");
+        QCOMPARE(change->propertyName(), "match");
         QCOMPARE(change->subjectId(),renderPassFilter->id());
         QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), filterKey1->id());
         QCOMPARE(change->type(), Qt3DCore::NodeAdded);
@@ -208,20 +208,20 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN
-        renderPassFilter->addInclude(filterKey1);
+        renderPassFilter->addMatch(filterKey1);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 0);
 
         // WHEN
-        renderPassFilter->removeInclude(filterKey1);
+        renderPassFilter->removeMatch(filterKey1);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
         change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
-        QCOMPARE(change->propertyName(), "include");
+        QCOMPARE(change->propertyName(), "match");
         QCOMPARE(change->subjectId(), renderPassFilter->id());
         QCOMPARE(change->value().value<Qt3DCore::QNodeId>(), filterKey1->id());
         QCOMPARE(change->type(), Qt3DCore::NodeRemoved);