refs #413 All value classes which had custom policies shall inherit from mixins instead.

This commit is contained in:
Mathew Sutcliffe
2015-05-03 23:34:06 +01:00
parent 9becc1c666
commit 36a2e1a2bb
38 changed files with 658 additions and 664 deletions

View File

@@ -18,20 +18,32 @@
namespace BlackMisc
{
//! \private
template <> struct CValueObjectPolicy<Geo::CLatitude> : public CValueObjectPolicy<>
{
using MetaType = Policy::MetaType::Default;
};
namespace Geo
{
//! Latitude
class BLACKMISC_EXPORT CLatitude : public CValueObject<CLatitude, CEarthAngle<CLatitude>>
class BLACKMISC_EXPORT CLatitude :
public CEarthAngle<CLatitude>,
public Mixin::MetaType<CLatitude>,
public Mixin::String<CLatitude>,
public Mixin::DBusOperators<CLatitude>
{
public:
//! Base type
using base_type = CEarthAngle<CLatitude>;
using Mixin::MetaType<CLatitude>::registerMetadata;
using Mixin::MetaType<CLatitude>::getMetaTypeId;
using Mixin::MetaType<CLatitude>::isA;
using Mixin::MetaType<CLatitude>::toCVariant;
using Mixin::MetaType<CLatitude>::toQVariant;
using Mixin::MetaType<CLatitude>::convertFromCVariant;
using Mixin::MetaType<CLatitude>::convertFromQVariant;
using Mixin::String<CLatitude>::toQString;
using Mixin::String<CLatitude>::toFormattedQString;
using Mixin::String<CLatitude>::toStdString;
using Mixin::String<CLatitude>::stringForStreaming;
//! \copydoc CValueObject::convertToQString
QString convertToQString(bool i18n = false) const
{
@@ -47,10 +59,10 @@ namespace BlackMisc
CLatitude() = default;
//! Constructor
explicit CLatitude(const BlackMisc::PhysicalQuantities::CAngle &angle) : CValueObject(angle) {}
explicit CLatitude(const BlackMisc::PhysicalQuantities::CAngle &angle) : CEarthAngle(angle) {}
//! Init by double value
CLatitude(double value, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CValueObject(value, unit) {}
CLatitude(double value, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CEarthAngle(value, unit) {}
};
}