diff options
author | Robert Brock <robert.brock@kdab.com> | 2016-03-18 17:08:21 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-23 10:05:59 +0000 |
commit | 74a5c1943db6e8b244ccd2f18485f0d0da3e3ed7 (patch) | |
tree | 8fe2fded4dda8b53e124bd6ff47ecaf2408522d9 /src/render/framegraph/qrenderpassfilter.cpp | |
parent | 98ada0f0a9edf5132c08c2603ba20fb5e3001c63 (diff) |
Class QRenderPassFilter renaming
includes -> matchAny
addInclude -> addMatch
removeInclude -> removeMatch
Change-Id: Ib9288ab79b3e76ae8a8aa2f7e3f20c5386438a25
Task-number: QTBUG-51456
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/framegraph/qrenderpassfilter.cpp')
-rw-r--r-- | src/render/framegraph/qrenderpassfilter.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
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))); } |