flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-21 04:45:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #413 CVariant and CPropertyIndexVariantMap equality operator templates support any metatype-registered class, not just CValueObject subclasses.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-05-03 15:38:05 +01:00
parent 9f98943c1f
commit 9becc1c666
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackmisc/propertyindexvariantmap.h
View File

@@ -116,22 +116,22 @@ namespace BlackMisc
//! Operator == with CValueObject //! Operator == with CValueObject
//! \todo Still needed? //! \todo Still needed?
template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type> template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
friend bool operator ==(const CPropertyIndexVariantMap &valueMap, const T &valueObject) { return valueMap == CVariant::from(valueObject); } friend bool operator ==(const CPropertyIndexVariantMap &valueMap, const T &valueObject) { return valueMap == CVariant::from(valueObject); }
//! Operator != with CValueObject //! Operator != with CValueObject
//! \todo Still needed? //! \todo Still needed?
template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type> template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
friend bool operator !=(const CPropertyIndexVariantMap &valueMap, const T &valueObject) { return valueMap != CVariant::from(valueObject); } friend bool operator !=(const CPropertyIndexVariantMap &valueMap, const T &valueObject) { return valueMap != CVariant::from(valueObject); }
//! Operator == with CValueObject //! Operator == with CValueObject
//! \todo Still needed? //! \todo Still needed?
template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type> template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
friend bool operator ==(const T &valueObject, const CPropertyIndexVariantMap &valueMap) { return valueMap == CVariant::from(valueObject); } friend bool operator ==(const T &valueObject, const CPropertyIndexVariantMap &valueMap) { return valueMap == CVariant::from(valueObject); }
//! Operator != with CValueObject //! Operator != with CValueObject
//! \todo Still needed? //! \todo Still needed?
template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type> template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
friend bool operator !=(const T &valueObject, const CPropertyIndexVariantMap &valueMap) { return valueMap != CVariant::from(valueObject); } friend bool operator !=(const T &valueObject, const CPropertyIndexVariantMap &valueMap) { return valueMap != CVariant::from(valueObject); }
//! Map //! Map

8
src/blackmisc/variant.h
View File

@@ -239,7 +239,7 @@ namespace BlackMisc
}; };
//! Compare stored value of CVariant with any CValueObject derived class. //! Compare stored value of CVariant with any CValueObject derived class.
template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type> template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
bool operator ==(const T &value, const CVariant &variant) bool operator ==(const T &value, const CVariant &variant)
{ {
if (variant.canConvert<T>()) { return variant.value<T>() == value; } if (variant.canConvert<T>()) { return variant.value<T>() == value; }
@@ -247,21 +247,21 @@ namespace BlackMisc
} }
//! Compare stored value of CVariant with any CValueObject derived class. //! Compare stored value of CVariant with any CValueObject derived class.
template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type> template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
bool operator !=(const T &value, const CVariant &variant) bool operator !=(const T &value, const CVariant &variant)
{ {
return !(value == variant); return !(value == variant);
} }
//! Compare stored value of CVariant with any CValueObject derived class. //! Compare stored value of CVariant with any CValueObject derived class.
template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type> template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
bool operator ==(const CVariant &variant, const T &value) bool operator ==(const CVariant &variant, const T &value)
{ {
return value == variant; return value == variant;
} }
//! Compare stored value of CVariant with any CValueObject derived class. //! Compare stored value of CVariant with any CValueObject derived class.
template <class T, class = typename std::enable_if<IsValueObject<T>::value>::type> template <class T, class = typename std::enable_if<QMetaTypeId<T>::Defined>::type>
bool operator !=(const CVariant &variant, const T &value) bool operator !=(const CVariant &variant, const T &value)
{ {
return !(value == variant); return !(value == variant);