mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-14 00:25:35 +08:00
refs #413, #416 Using Mixin::Index in more classes so that index "myself" yields correct derived type.
(cherry picked from commit 2b7f7eb6b692a3464863ece86b30ea0b7efc2a1d)
This commit is contained in:
@@ -13,7 +13,6 @@
|
||||
#define BLACKMISC_GEO_LATITUDE_H
|
||||
|
||||
#include "blackmisc/blackmiscexport.h"
|
||||
#include <QtCore/qmath.h>
|
||||
#include "blackmisc/geo/earthangle.h"
|
||||
|
||||
namespace BlackMisc
|
||||
@@ -26,7 +25,8 @@ namespace BlackMisc
|
||||
public CEarthAngle<CLatitude>,
|
||||
public Mixin::MetaType<CLatitude>,
|
||||
public Mixin::String<CLatitude>,
|
||||
public Mixin::DBusOperators<CLatitude>
|
||||
public Mixin::DBusOperators<CLatitude>,
|
||||
public Mixin::Index<CLatitude>
|
||||
{
|
||||
public:
|
||||
//! Base type
|
||||
@@ -34,6 +34,7 @@ namespace BlackMisc
|
||||
|
||||
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CLatitude)
|
||||
BLACKMISC_DECLARE_USING_MIXIN_STRING(CLatitude)
|
||||
BLACKMISC_DECLARE_USING_MIXIN_INDEX(CLatitude)
|
||||
|
||||
//! \copydoc CValueObject::convertToQString
|
||||
QString convertToQString(bool i18n = false) const
|
||||
|
||||
@@ -25,7 +25,8 @@ namespace BlackMisc
|
||||
public CEarthAngle<CLongitude>,
|
||||
public Mixin::MetaType<CLongitude>,
|
||||
public Mixin::String<CLongitude>,
|
||||
public Mixin::DBusOperators<CLongitude>
|
||||
public Mixin::DBusOperators<CLongitude>,
|
||||
public Mixin::Index<CLongitude>
|
||||
{
|
||||
public:
|
||||
//! Base type
|
||||
@@ -33,6 +34,7 @@ namespace BlackMisc
|
||||
|
||||
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CLongitude)
|
||||
BLACKMISC_DECLARE_USING_MIXIN_STRING(CLongitude)
|
||||
BLACKMISC_DECLARE_USING_MIXIN_INDEX(CLongitude)
|
||||
|
||||
//! \copydoc CValueObject::convertToQString
|
||||
QString convertToQString(bool i18n = false) const
|
||||
|
||||
Reference in New Issue
Block a user