refs #413 Macros to ease the task of disambiguating inherited members when using mixins in an inheritance hierarchy.

This commit is contained in:
Mathew Sutcliffe
2015-05-03 23:15:02 +01:00
parent 36a2e1a2bb
commit 68ebcd7b8d
10 changed files with 89 additions and 153 deletions

View File

@@ -32,17 +32,8 @@ namespace BlackMisc
//! 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;
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CLatitude)
BLACKMISC_DECLARE_USING_MIXIN_STRING(CLatitude)
//! \copydoc CValueObject::convertToQString
QString convertToQString(bool i18n = false) const

View File

@@ -31,17 +31,8 @@ namespace BlackMisc
//! Base type
using base_type = CEarthAngle<CLongitude>;
using Mixin::MetaType<CLongitude>::registerMetadata;
using Mixin::MetaType<CLongitude>::getMetaTypeId;
using Mixin::MetaType<CLongitude>::isA;
using Mixin::MetaType<CLongitude>::toCVariant;
using Mixin::MetaType<CLongitude>::toQVariant;
using Mixin::MetaType<CLongitude>::convertFromCVariant;
using Mixin::MetaType<CLongitude>::convertFromQVariant;
using Mixin::String<CLongitude>::toQString;
using Mixin::String<CLongitude>::toFormattedQString;
using Mixin::String<CLongitude>::toStdString;
using Mixin::String<CLongitude>::stringForStreaming;
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CLongitude)
BLACKMISC_DECLARE_USING_MIXIN_STRING(CLongitude)
//! \copydoc CValueObject::convertToQString
QString convertToQString(bool i18n = false) const