diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-16 15:18:48 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-10-17 21:16:27 +0200 |
| commit | 0e3f38f79c62fcb6a93b7371c9b2c2cba106772c (patch) | |
| tree | 77abf25f8076e8531391e5058dca5d421911a877 /src/render/frontend/qtechnique.cpp | |
| parent | dbe217b871e11820279d62964d8df2f16d57778c (diff) | |
Renamed QCriterion to QAnnotation
Change-Id: I4b40120807a60873b38687ba8ce0b6c2dfd77127
Task-number: QTBUG-41534
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qtechnique.cpp')
| -rw-r--r-- | src/render/frontend/qtechnique.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/render/frontend/qtechnique.cpp b/src/render/frontend/qtechnique.cpp index 0485d113c..2406a3101 100644 --- a/src/render/frontend/qtechnique.cpp +++ b/src/render/frontend/qtechnique.cpp @@ -74,8 +74,8 @@ void QTechnique::copy(const QNode *ref) const QTechnique *tech = static_cast<const QTechnique*>(ref); d_func()->m_openGLFilter->copy(tech->d_func()->m_openGLFilter); - Q_FOREACH (QCriterion *criterion, tech->d_func()->m_criteriaList) - addCriterion(qobject_cast<QCriterion *>(QNodePrivate::get(criterion)->clone())); + Q_FOREACH (QAnnotation *criterion, tech->d_func()->m_criteriaList) + addCriterion(qobject_cast<QAnnotation *>(QNodePrivate::get(criterion)->clone())); Q_FOREACH (QRenderPass *pass, tech->d_func()->m_renderPasses) addPass(qobject_cast<QRenderPass *>(QNodePrivate::get(pass)->clone())); Q_FOREACH (QParameter *p, tech->d_func()->m_parameters) @@ -102,7 +102,7 @@ void QTechnique::openGLFilterChanged() } } -void QTechnique::addCriterion(QCriterion *criterion) +void QTechnique::addCriterion(QAnnotation *criterion) { Q_D(QTechnique); if (!d->m_criteriaList.contains(criterion)) { @@ -124,7 +124,7 @@ void QTechnique::addCriterion(QCriterion *criterion) } } -void QTechnique::removeCriterion(QCriterion *criterion) +void QTechnique::removeCriterion(QAnnotation *criterion) { Q_D(QTechnique); if (d->m_changeArbiter != Q_NULLPTR) { @@ -136,7 +136,7 @@ void QTechnique::removeCriterion(QCriterion *criterion) d->m_criteriaList.removeOne(criterion); } -QList<QCriterion *> QTechnique::criteria() const +QList<QAnnotation *> QTechnique::criteria() const { Q_D(const QTechnique); return d->m_criteriaList; |