From 4ac71834313da3f5942a56282d4d337aef5a81f3 Mon Sep 17 00:00:00 2001 From: Janne Koskinen Date: Tue, 1 Mar 2016 17:49:42 +0200 Subject: Renaming QTechniqueFilter API As per API review. Change-Id: Ib3565b6cce74803fcf4920f125c3444e4b44444e Task-number: QTBUG-51512 Reviewed-by: Sean Harmer --- examples/qt3d/compute-particles/ComputeFrameGraph.qml | 4 ++-- examples/qt3d/materials/SortedForwardRenderer.qml | 2 +- examples/qt3d/planets-qml/PlanetFrameGraph.qml | 2 +- examples/qt3d/playground-qml/MyForwardRenderer.qml | 2 +- examples/qt3d/wave/WaveForwardRenderer.qml | 2 +- .../quick3drender/items/quick3dtechniquefilter.cpp | 6 +++--- .../quick3drender/items/quick3dtechniquefilter_p.h | 4 ++-- src/render/defaults/qforwardrenderer.cpp | 2 +- src/render/framegraph/qtechniquefilter.cpp | 16 ++++++++-------- src/render/framegraph/qtechniquefilter.h | 4 ++-- src/render/framegraph/qtechniquefilter_p.h | 2 +- .../render/qtechniquefilter/tst_qtechniquefilter.cpp | 14 +++++++------- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/examples/qt3d/compute-particles/ComputeFrameGraph.qml b/examples/qt3d/compute-particles/ComputeFrameGraph.qml index 67ed8f9a9..8f03ba0aa 100644 --- a/examples/qt3d/compute-particles/ComputeFrameGraph.qml +++ b/examples/qt3d/compute-particles/ComputeFrameGraph.qml @@ -67,7 +67,7 @@ Viewport { DispatchCompute { workGroupX: 1024; workGroupY: 1; workGroupZ: 1 TechniqueFilter { - requires: [ + matchAll: [ Annotation { name: "type"; value: "compute"} ] } @@ -77,7 +77,7 @@ Viewport { CameraSelector { id: selector TechniqueFilter { - requires: [ + matchAll: [ Annotation { name: "type"; value: "draw"} ] } diff --git a/examples/qt3d/materials/SortedForwardRenderer.qml b/examples/qt3d/materials/SortedForwardRenderer.qml index 7ca9b21e9..1c7258fb5 100644 --- a/examples/qt3d/materials/SortedForwardRenderer.qml +++ b/examples/qt3d/materials/SortedForwardRenderer.qml @@ -60,7 +60,7 @@ TechniqueFilter { property alias window: surfaceSelector.window // Select the forward rendering Technique of any used Effect - requires: [ Annotation { name: "renderingStyle"; value: "forward" } ] + matchAll: [ Annotation { name: "renderingStyle"; value: "forward" } ] RenderSurfaceSelector { id: surfaceSelector diff --git a/examples/qt3d/planets-qml/PlanetFrameGraph.qml b/examples/qt3d/planets-qml/PlanetFrameGraph.qml index 95dc51ac2..1be58c557 100644 --- a/examples/qt3d/planets-qml/PlanetFrameGraph.qml +++ b/examples/qt3d/planets-qml/PlanetFrameGraph.qml @@ -64,7 +64,7 @@ FrameGraph { clearColor: Qt.rgba(0.0, 0.0, 0.0, 1.0) TechniqueFilter { - requires: [ Annotation { name: "name"; value: "Desktop" } ] + matchAll: [ Annotation { name: "name"; value: "Desktop" } ] RenderPassFilter { diff --git a/examples/qt3d/playground-qml/MyForwardRenderer.qml b/examples/qt3d/playground-qml/MyForwardRenderer.qml index ed5a92685..9fe5032a3 100644 --- a/examples/qt3d/playground-qml/MyForwardRenderer.qml +++ b/examples/qt3d/playground-qml/MyForwardRenderer.qml @@ -68,7 +68,7 @@ TechniqueFilter { property alias layerFilters: layerFilter.layers property alias clearColor: viewport.clearColor - requires : [ + matchAll : [ Annotation { name: "RenderingStyle"; value: "forward";}, Annotation { name: "Enabled"; value: true;} ] diff --git a/examples/qt3d/wave/WaveForwardRenderer.qml b/examples/qt3d/wave/WaveForwardRenderer.qml index 32753e655..e7f6db824 100644 --- a/examples/qt3d/wave/WaveForwardRenderer.qml +++ b/examples/qt3d/wave/WaveForwardRenderer.qml @@ -59,7 +59,7 @@ TechniqueFilter { property alias window: surfaceSelector.window // Select the forward rendering Technique of any used Effect - requires: [ Annotation { name: "renderingStyle"; value: "forward" } ] + matchAll: [ Annotation { name: "renderingStyle"; value: "forward" } ] RenderSurfaceSelector { id: surfaceSelector diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp index d7bd30fdf..65dec82a0 100644 --- a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp +++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp @@ -50,7 +50,7 @@ Quick3DTechniqueFilter::Quick3DTechniqueFilter(QObject *parent) { } -QQmlListProperty Quick3DTechniqueFilter::requireList() +QQmlListProperty Quick3DTechniqueFilter::matchList() { return QQmlListProperty(this, 0, &Quick3DTechniqueFilter::appendRequire, @@ -73,7 +73,7 @@ void Quick3DTechniqueFilter::appendRequire(QQmlListProperty *list, Quick3DTechniqueFilter *filter = qobject_cast(list->object); if (filter) { criterion->setParent(filter->parentTechniqueFilter()); - filter->parentTechniqueFilter()->addRequirement(criterion); + filter->parentTechniqueFilter()->addMatch(criterion); } } @@ -98,7 +98,7 @@ void Quick3DTechniqueFilter::clearRequires(QQmlListProperty *list) Quick3DTechniqueFilter *filter = qobject_cast(list->object); if (filter) { Q_FOREACH (QAnnotation *criterion, filter->parentTechniqueFilter()->criteria()) - filter->parentTechniqueFilter()->removeRequirement(criterion); + filter->parentTechniqueFilter()->removeMatch(criterion); } } diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h index e8610b8df..a58835d81 100644 --- a/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h +++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter_p.h @@ -66,13 +66,13 @@ namespace Quick { class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DTechniqueFilter : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty requires READ requireList) + Q_PROPERTY(QQmlListProperty matchAll READ matchList) Q_PROPERTY(QQmlListProperty parameters READ parameterList) public: explicit Quick3DTechniqueFilter(QObject *parent = 0); - QQmlListProperty requireList(); + QQmlListProperty matchList(); QQmlListProperty parameterList(); inline QTechniqueFilter *parentTechniqueFilter() const { return qobject_cast(parent()); } diff --git a/src/render/defaults/qforwardrenderer.cpp b/src/render/defaults/qforwardrenderer.cpp index a447a6aa8..1ea45a63a 100644 --- a/src/render/defaults/qforwardrenderer.cpp +++ b/src/render/defaults/qforwardrenderer.cpp @@ -78,7 +78,7 @@ void QForwardRendererPrivate::init() QAnnotation *forwardRenderingStyle = new QAnnotation(q); forwardRenderingStyle->setName(QStringLiteral("renderingStyle")); forwardRenderingStyle->setValue(QStringLiteral("forward")); - q->addRequirement(forwardRenderingStyle); + q->addMatch(forwardRenderingStyle); } /*! diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp index ea0c2bb87..70ac57822 100644 --- a/src/render/framegraph/qtechniquefilter.cpp +++ b/src/render/framegraph/qtechniquefilter.cpp @@ -60,8 +60,8 @@ void QTechniqueFilter::copy(const QNode *ref) QFrameGraphNode::copy(ref); const QTechniqueFilter *other = static_cast(ref); - Q_FOREACH (QAnnotation *crit, other->d_func()->m_requireList) - addRequirement(qobject_cast(QNode::clone(crit))); + Q_FOREACH (QAnnotation *crit, other->d_func()->m_matchList) + addMatch(qobject_cast(QNode::clone(crit))); Q_FOREACH (QParameter *p, other->d_func()->m_parameters) addParameter(qobject_cast(QNode::clone(p))); } @@ -85,14 +85,14 @@ QTechniqueFilter::QTechniqueFilter(QTechniqueFilterPrivate &dd, QNode *parent) QList QTechniqueFilter::criteria() const { Q_D(const QTechniqueFilter); - return d->m_requireList; + return d->m_matchList; } -void QTechniqueFilter::addRequirement(QAnnotation *criterion) +void QTechniqueFilter::addMatch(QAnnotation *criterion) { Q_D(QTechniqueFilter); - if (!d->m_requireList.contains(criterion)) { - d->m_requireList.append(criterion); + if (!d->m_matchList.contains(criterion)) { + d->m_matchList.append(criterion); // 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 @@ -110,7 +110,7 @@ void QTechniqueFilter::addRequirement(QAnnotation *criterion) } } -void QTechniqueFilter::removeRequirement(QAnnotation *criterion) +void QTechniqueFilter::removeMatch(QAnnotation *criterion) { Q_D(QTechniqueFilter); if (d->m_changeArbiter != Q_NULLPTR) { @@ -119,7 +119,7 @@ void QTechniqueFilter::removeRequirement(QAnnotation *criterion) propertyChange->setValue(QVariant::fromValue(criterion->id())); d->notifyObservers(propertyChange); } - d->m_requireList.removeOne(criterion); + d->m_matchList.removeOne(criterion); } void QTechniqueFilter::addParameter(QParameter *parameter) diff --git a/src/render/framegraph/qtechniquefilter.h b/src/render/framegraph/qtechniquefilter.h index 5e96ee6d2..808289a62 100644 --- a/src/render/framegraph/qtechniquefilter.h +++ b/src/render/framegraph/qtechniquefilter.h @@ -59,8 +59,8 @@ public: ~QTechniqueFilter(); QList criteria() const; - void addRequirement(QAnnotation *criterion); - void removeRequirement(QAnnotation *criterion); + void addMatch(QAnnotation *criterion); + void removeMatch(QAnnotation *criterion); void addParameter(QParameter *p); void removeParameter(QParameter *p); diff --git a/src/render/framegraph/qtechniquefilter_p.h b/src/render/framegraph/qtechniquefilter_p.h index a58a6ccd3..89874b72b 100644 --- a/src/render/framegraph/qtechniquefilter_p.h +++ b/src/render/framegraph/qtechniquefilter_p.h @@ -65,7 +65,7 @@ public : QTechniqueFilterPrivate(); Q_DECLARE_PUBLIC(QTechniqueFilter) - QList m_requireList; + QList m_matchList; QList m_parameters; }; diff --git a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp index a30258c97..24a5ba781 100644 --- a/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp +++ b/tests/auto/render/qtechniquefilter/tst_qtechniquefilter.cpp @@ -83,8 +83,8 @@ private Q_SLOTS: annotation1->setName(QStringLiteral("hasNitroKit")); annotation1->setValue(false); QList annotations1 = QList() << annotation1 << annotation2; - techniqueFilterWithAnnotations->addRequirement(annotation1); - techniqueFilterWithAnnotations->addRequirement(annotation2); + techniqueFilterWithAnnotations->addMatch(annotation1); + techniqueFilterWithAnnotations->addMatch(annotation2); QTest::newRow("techniqueFilterWithAnnotations") << techniqueFilterWithAnnotations << QList() << annotations1; Qt3DRender::QTechniqueFilter *techniqueFilterWithParamsAndAnnotations = new Qt3DRender::QTechniqueFilter(); @@ -100,8 +100,8 @@ private Q_SLOTS: QList annotations2 = QList() << annotation3 << annotation4; techniqueFilterWithParamsAndAnnotations->addParameter(parameter3); techniqueFilterWithParamsAndAnnotations->addParameter(parameter4); - techniqueFilterWithParamsAndAnnotations->addRequirement(annotation3); - techniqueFilterWithParamsAndAnnotations->addRequirement(annotation4); + techniqueFilterWithParamsAndAnnotations->addMatch(annotation3); + techniqueFilterWithParamsAndAnnotations->addMatch(annotation4); QTest::newRow("techniqueFilterWithParamsAndAnnotations") << techniqueFilterWithParamsAndAnnotations << params2 << annotations2; } @@ -194,7 +194,7 @@ private Q_SLOTS: // WHEN Qt3DRender::QAnnotation *annotation1 = new Qt3DRender::QAnnotation(); - techniqueFilter->addRequirement(annotation1); + techniqueFilter->addMatch(annotation1); QCoreApplication::processEvents(); // THEN @@ -208,14 +208,14 @@ private Q_SLOTS: arbiter.events.clear(); // WHEN - techniqueFilter->addRequirement(annotation1); + techniqueFilter->addMatch(annotation1); QCoreApplication::processEvents(); // THEN QCOMPARE(arbiter.events.size(), 0); // WHEN - techniqueFilter->removeRequirement(annotation1); + techniqueFilter->removeMatch(annotation1); QCoreApplication::processEvents(); // THEN -- cgit v1.2.3