diff options
author | Dominik Holland <dominik.holland@qt.io> | 2020-03-19 09:13:47 +0100 |
---|---|---|
committer | Dominik Holland <dominik.holland@qt.io> | 2020-03-23 09:24:23 +0100 |
commit | c3bb1a319d40a31befe7d24e0da60d479ee7c7da (patch) | |
tree | 5944a764bc3477f1aff7aaaa4b77fe23e355943c /src | |
parent | 860d5b6efef41b20edb9ba22b315855e3cff0f4b (diff) | |
download | qtivi-c3bb1a319d40a31befe7d24e0da60d479ee7c7da.tar.gz |
Fix operator== for all QIviStandardItem derived types
The operator== wasn't marked as const and because of that didn't work.
Change-Id: I6566d86c4864960ee88d1f1d5f0c6974f0125445
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/ivicore/qivistandarditem.cpp | 2 | ||||
-rw-r--r-- | src/ivicore/qivistandarditem.h | 4 | ||||
-rw-r--r-- | src/ivimedia/qiviplayableitem.cpp | 4 | ||||
-rw-r--r-- | src/ivimedia/qiviplayableitem.h | 8 | ||||
-rw-r--r-- | src/ivimedia/qivitunerstation.cpp | 4 | ||||
-rw-r--r-- | src/ivimedia/qivitunerstation.h | 8 |
6 files changed, 15 insertions, 15 deletions
diff --git a/src/ivicore/qivistandarditem.cpp b/src/ivicore/qivistandarditem.cpp index 3d287cd..53a5746 100644 --- a/src/ivicore/qivistandarditem.cpp +++ b/src/ivicore/qivistandarditem.cpp @@ -174,7 +174,7 @@ void QIviStandardItem::setData(const QVariantMap &data) \sa operator!=() */ -bool QIviStandardItem::operator==(const QIviStandardItem &other) +bool QIviStandardItem::operator==(const QIviStandardItem &other) const { return (d->m_id == other.d->m_id); } diff --git a/src/ivicore/qivistandarditem.h b/src/ivicore/qivistandarditem.h index a319d31..1659d88 100644 --- a/src/ivicore/qivistandarditem.h +++ b/src/ivicore/qivistandarditem.h @@ -75,8 +75,8 @@ public: virtual QVariantMap data() const; virtual void setData(const QVariantMap &data); - bool operator==(const QIviStandardItem &other); - inline bool operator!=(const QIviStandardItem &other) { return !(*this == other); } + bool operator==(const QIviStandardItem &other) const; + inline bool operator!=(const QIviStandardItem &other) const { return !(*this == other); } private: QSharedDataPointer<QIviStandardItemPrivate> d; diff --git a/src/ivimedia/qiviplayableitem.cpp b/src/ivimedia/qiviplayableitem.cpp index cdda057..aad95a8 100644 --- a/src/ivimedia/qiviplayableitem.cpp +++ b/src/ivimedia/qiviplayableitem.cpp @@ -173,7 +173,7 @@ QString QIviPlayableItem::type() const \sa operator!=() */ -bool QIviPlayableItem::operator==(const QIviPlayableItem &other) +bool QIviPlayableItem::operator==(const QIviPlayableItem &other) const { return (QIviStandardItem::operator==(other) && d->m_url == other.d->m_url); @@ -454,7 +454,7 @@ QString QIviAudioTrackItem::type() const \sa operator!=() */ -bool QIviAudioTrackItem::operator==(const QIviAudioTrackItem &other) +bool QIviAudioTrackItem::operator==(const QIviAudioTrackItem &other) const { return (QIviPlayableItem::operator==(other) && d->m_title == other.d->m_title && diff --git a/src/ivimedia/qiviplayableitem.h b/src/ivimedia/qiviplayableitem.h index 3e41c1c..ff2de2f 100644 --- a/src/ivimedia/qiviplayableitem.h +++ b/src/ivimedia/qiviplayableitem.h @@ -69,8 +69,8 @@ public: virtual void setUrl(const QUrl &url); virtual QString type() const override; - bool operator==(const QIviPlayableItem &other); - inline bool operator!=(const QIviPlayableItem &other) { return !(*this == other); } + bool operator==(const QIviPlayableItem &other) const; + inline bool operator!=(const QIviPlayableItem &other) const { return !(*this == other); } private: QSharedDataPointer<QIviPlayableItemPrivate> d; @@ -118,8 +118,8 @@ public: virtual QString name() const override; virtual QString type() const override; - bool operator==(const QIviAudioTrackItem &other); - inline bool operator!=(const QIviAudioTrackItem &other) { return !(*this == other); } + bool operator==(const QIviAudioTrackItem &other) const; + inline bool operator!=(const QIviAudioTrackItem &other) const { return !(*this == other); } private: QSharedDataPointer<QIviAudioTrackItemPrivate> d; diff --git a/src/ivimedia/qivitunerstation.cpp b/src/ivimedia/qivitunerstation.cpp index af119b6..908de32 100644 --- a/src/ivimedia/qivitunerstation.cpp +++ b/src/ivimedia/qivitunerstation.cpp @@ -298,7 +298,7 @@ QString QIviTunerStation::type() const \sa operator!=() */ -bool QIviTunerStation::operator==(const QIviTunerStation &other) +bool QIviTunerStation::operator==(const QIviTunerStation &other) const { return (QIviStandardItem::operator==(other) && d->m_stationName == other.d->m_stationName && @@ -400,7 +400,7 @@ QString QIviAmFmTunerStation::type() const \sa operator!=() */ -bool QIviAmFmTunerStation::operator==(const QIviAmFmTunerStation &other) +bool QIviAmFmTunerStation::operator==(const QIviAmFmTunerStation &other) const { return (QIviTunerStation::operator==(other) && d->m_band == other.d->m_band); diff --git a/src/ivimedia/qivitunerstation.h b/src/ivimedia/qivitunerstation.h index b1e7f4b..715b62d 100644 --- a/src/ivimedia/qivitunerstation.h +++ b/src/ivimedia/qivitunerstation.h @@ -84,8 +84,8 @@ public: virtual QString name() const override; virtual QString type() const override; - bool operator==(const QIviTunerStation &other); - inline bool operator!=(const QIviTunerStation &other) { return !(*this == other); } + bool operator==(const QIviTunerStation &other) const; + inline bool operator!=(const QIviTunerStation &other) const { return !(*this == other); } private: QSharedDataPointer<QIviTunerStationPrivate> d; @@ -108,8 +108,8 @@ public: virtual void setBand(QIviAmFmTuner::Band band); virtual QString type() const override; - bool operator==(const QIviAmFmTunerStation &other); - inline bool operator!=(const QIviAmFmTunerStation &other) { return !(*this == other); } + bool operator==(const QIviAmFmTunerStation &other) const; + inline bool operator!=(const QIviAmFmTunerStation &other) const { return !(*this == other); } private: QSharedDataPointer<QIviAmFmTunerStationPrivate> d; |