diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-09-05 15:13:37 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2016-11-23 20:23:32 +0000 |
| commit | c09d4813f72c1d914fbdc7c5ddf41543a81d5eae (patch) | |
| tree | 41a5e99491e2f09f97ce5a42ce5a511df948c5af | |
| parent | 348d3428bf337cbdcbdfafca7c64e87368b4977a (diff) | |
FilterKey: remove criterion prefix from getters
Change-Id: Ia0cb9cf0ce10666f84e7027aecb8ada3f09d940a
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| -rw-r--r-- | src/render/materialsystem/filterkey.cpp | 8 | ||||
| -rw-r--r-- | src/render/materialsystem/filterkey_p.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/render/materialsystem/filterkey.cpp b/src/render/materialsystem/filterkey.cpp index db139f1fe..c06821b0b 100644 --- a/src/render/materialsystem/filterkey.cpp +++ b/src/render/materialsystem/filterkey.cpp @@ -70,12 +70,12 @@ void FilterKey::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &ch m_value = data.value; } -QVariant FilterKey::criterionValue() const +QVariant FilterKey::value() const { return m_value; } -QString FilterKey::criterionName() const +QString FilterKey::name() const { return m_name; } @@ -103,8 +103,8 @@ bool FilterKey::operator ==(const FilterKey &other) { if (&other == this) return true; - return ((other.criterionName() == criterionName()) && - (other.criterionValue() == criterionValue())); + return ((other.name() == name()) && + (other.value() == value())); } bool FilterKey::operator !=(const FilterKey &other) diff --git a/src/render/materialsystem/filterkey_p.h b/src/render/materialsystem/filterkey_p.h index 92924cacb..4aea3d78a 100644 --- a/src/render/materialsystem/filterkey_p.h +++ b/src/render/materialsystem/filterkey_p.h @@ -69,8 +69,8 @@ public: ~FilterKey(); void cleanup(); - QVariant criterionValue() const; - QString criterionName() const; + QVariant value() const; + QString name() const; void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; bool operator ==(const FilterKey &other); bool operator !=(const FilterKey &other); |