diff options
| author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-03-03 12:57:38 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-03-17 11:25:16 +0000 |
| commit | c01bc22c287e58186a285b3f8507711fd982fd05 (patch) | |
| tree | 77a5b100d5a02de3cf864672590cdde5d4099301 /src/render/framegraph/qtechniquefilter.cpp | |
| parent | a8371dccd60a097678239edc510e5bb4624b52b8 (diff) | |
QAnnotation changes
Task-number: QTBUG-51454
Change-Id: Iee08f6b1be39894c40926afb20e003d46bc735f4
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/framegraph/qtechniquefilter.cpp')
| -rw-r--r-- | src/render/framegraph/qtechniquefilter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp index a7d4f32f9..5e538ba91 100644 --- a/src/render/framegraph/qtechniquefilter.cpp +++ b/src/render/framegraph/qtechniquefilter.cpp @@ -40,7 +40,7 @@ #include "qtechniquefilter.h" #include "qtechniquefilter_p.h" -#include <Qt3DRender/qannotation.h> +#include <Qt3DRender/qfilterkey.h> #include <Qt3DRender/qparameter.h> #include <Qt3DCore/qscenepropertychange.h> @@ -60,8 +60,8 @@ void QTechniqueFilter::copy(const QNode *ref) QFrameGraphNode::copy(ref); const QTechniqueFilter *other = static_cast<const QTechniqueFilter*>(ref); - for (QAnnotation *crit : other->d_func()->m_matchList) - addMatch(qobject_cast<QAnnotation *>(QNode::clone(crit))); + Q_FOREACH (QFilterKey *crit, other->d_func()->m_matchList) + addMatch(qobject_cast<QFilterKey *>(QNode::clone(crit))); for (QParameter *p : other->d_func()->m_parameters) addParameter(qobject_cast<QParameter *>(QNode::clone(p))); } @@ -82,13 +82,13 @@ QTechniqueFilter::QTechniqueFilter(QTechniqueFilterPrivate &dd, QNode *parent) { } -QList<QAnnotation *> QTechniqueFilter::criteria() const +QList<QFilterKey *> QTechniqueFilter::criteria() const { Q_D(const QTechniqueFilter); return d->m_matchList; } -void QTechniqueFilter::addMatch(QAnnotation *criterion) +void QTechniqueFilter::addMatch(QFilterKey *criterion) { Q_D(QTechniqueFilter); if (!d->m_matchList.contains(criterion)) { @@ -110,7 +110,7 @@ void QTechniqueFilter::addMatch(QAnnotation *criterion) } } -void QTechniqueFilter::removeMatch(QAnnotation *criterion) +void QTechniqueFilter::removeMatch(QFilterKey *criterion) { Q_D(QTechniqueFilter); if (d->m_changeArbiter != Q_NULLPTR) { |