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

refs #472 Removed static_cast<int> for enums in blackmisc, no longer needed.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-09-27 01:41:42 +01:00
parent 9b1e42d71a
commit d13e863218
23 changed files with 104 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/blackmisc/aviation/comsystem.cpp
View File

@@ -18,6 +18,13 @@ namespace BlackMisc
namespace Aviation
{
void CComSystem::registerMetadata()
{
Mixin::MetaType<CComSystem>::registerMetadata();
qDBusRegisterMetaType<ChannelSpacing>();
qDBusRegisterMetaType<ComUnit>();
}
bool CComSystem::validValues() const
{
if (this->isDefaultValue()) return true; // special case

5
src/blackmisc/aviation/comsystem.h
View File

@@ -49,6 +49,9 @@ namespace BlackMisc
Com2
};
//! \copydoc BlackMisc::CValueObject::registerMetadata
static void registerMetadata();
//! Default constructor
CComSystem() {}
@@ -171,5 +174,7 @@ namespace BlackMisc
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CComSystem, (o.m_channelSpacing))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CComSystem)
Q_DECLARE_METATYPE(BlackMisc::Aviation::CComSystem::ChannelSpacing)
Q_DECLARE_METATYPE(BlackMisc::Aviation::CComSystem::ComUnit)
#endif // guard

10
src/blackmisc/aviation/transponder.cpp
View File

@@ -17,6 +17,12 @@ namespace BlackMisc
namespace Aviation
{
void CTransponder::registerMetadata()
{
CValueObject<CTransponder>::registerMetadata();
qRegisterMetaType<TransponderMode>();
}
bool CTransponder::validValues() const
{
if (this->isDefaultValue()) return true; // special case
@@ -151,7 +157,7 @@ namespace BlackMisc
switch (i)
{
case IndexMode:
return CVariant::from(static_cast<int>(this->getTransponderMode()));
return CVariant::from(this->getTransponderMode());
case IndexModeAsString:
return CVariant::from(this->getModeAsString());
case IndexTransponderCode:
@@ -176,7 +182,7 @@ namespace BlackMisc
switch (i)
{
case IndexMode:
this->setTransponderMode(static_cast<TransponderMode>(variant.toInt()));
this->setTransponderMode(variant.value<TransponderMode>());
break;
case IndexModeAsString:
this->setTransponderMode(modeFromString(variant.toQString()));

4
src/blackmisc/aviation/transponder.h
View File

@@ -45,6 +45,9 @@ namespace BlackMisc
IndexTransponderCodeAndModeFormatted
};
//! \copydoc BlackMisc::CValueObject::registerMetadata
static void registerMetadata();
//! Default constructor
CTransponder() : m_transponderCode(0), m_transponderMode(StateStandby) {}
@@ -184,5 +187,6 @@ BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Aviation::CTransponder, (
))
Q_DECLARE_METATYPE(BlackMisc::Aviation::CTransponder)
Q_DECLARE_METATYPE(BlackMisc::Aviation::CTransponder::TransponderMode)
#endif // guard