From 57b2a6b5885433d35b133ff15a1318536e7de6e7 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Sat, 15 Nov 2014 20:49:40 +0000 Subject: [PATCH] refs #247 Removed methods which were missed in refs #345. --- src/blackmisc/coordinateecef.h | 3 --- src/blackmisc/valueobject.h | 36 ---------------------------------- 2 files changed, 39 deletions(-) diff --git a/src/blackmisc/coordinateecef.h b/src/blackmisc/coordinateecef.h index 3ffd61b60..ec1615ebe 100644 --- a/src/blackmisc/coordinateecef.h +++ b/src/blackmisc/coordinateecef.h @@ -47,9 +47,6 @@ namespace BlackMisc */ explicit CCoordinateEcef(const BlackMisc::Math::CVector3D vector) : CValueObjectStdTuple(vector.i(), vector.j(), vector.k()) {} - //! \copydoc CValueObject::toQVariant - virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); } - //! \brief x double x() const { diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h index 0ad3e903f..2cdc4e29e 100644 --- a/src/blackmisc/valueobject.h +++ b/src/blackmisc/valueobject.h @@ -114,42 +114,6 @@ namespace BlackMisc //! Operator != with value map friend bool operator!=(const CValueObject &valueObject, const CPropertyIndexVariantMap &valueMap); - //! Comparison operator to allow valueobjects be used as keys in QMap and std::set. - template friend typename std::enable_if < std::is_base_of::value &&! PhysicalQuantities::IsQuantity::value, bool >::type - operator<(const T &lhs, const T &rhs) - { - const auto &lhsBase = static_cast(lhs); - const auto &rhsBase = static_cast(rhs); - return lhsBase.compareImpl(rhsBase) < 0; - } - - //! Comparison for symmetry with operator<. - template friend typename std::enable_if < std::is_base_of::value &&! PhysicalQuantities::IsQuantity::value, bool >::type - operator>(const T &lhs, const T &rhs) - { - const auto &lhsBase = static_cast(lhs); - const auto &rhsBase = static_cast(rhs); - return lhsBase.compareImpl(rhsBase) > 0; - } - - //! Comparison for symmetry with operator<. - template friend typename std::enable_if < std::is_base_of::value &&! PhysicalQuantities::IsQuantity::value, bool >::type - operator<=(const T &lhs, const T &rhs) - { - const auto &lhsBase = static_cast(lhs); - const auto &rhsBase = static_cast(rhs); - return lhsBase.compareImpl(rhsBase) <= 0; - } - - //! Comparison for symmetry with operator<. - template friend typename std::enable_if < std::is_base_of::value &&! PhysicalQuantities::IsQuantity::value, bool >::type - operator>=(const T &lhs, const T &rhs) - { - const auto &lhsBase = static_cast(lhs); - const auto &rhsBase = static_cast(rhs); - return lhsBase.compareImpl(rhsBase) >= 0; - } - /*! * Compares two instances of related classes * and returns an integer less than, equal to, or greater than zero