flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-16 18:35:35 +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

15
src/blackmisc/weather/presentweather.cpp
View File

@@ -17,6 +17,13 @@ namespace BlackMisc
namespace Weather
{
void CPresentWeather::registerMetadata()
{
CValueObject<CPresentWeather>::registerMetadata();
qRegisterMetaType<Intensity>();
qRegisterMetaType<Descriptor>();
}
CPresentWeather::CPresentWeather(Intensity intensity, Descriptor descriptor, int weatherPhenomena) :
m_intensity(intensity), m_descriptor(descriptor), m_weatherPhenomena(weatherPhenomena)
{ }
@@ -28,9 +35,9 @@ namespace BlackMisc
switch (i)
{
case IndexIntensity:
return CVariant::fromValue<int>(static_cast<int>(m_intensity));
return CVariant::fromValue(m_intensity);
case IndexDescriptor:
return CVariant::fromValue<int>(static_cast<int>(m_descriptor));
return CVariant::fromValue(m_descriptor);
case IndexWeatherPhenomena:
return CVariant::fromValue(m_weatherPhenomena);
default:
@@ -45,10 +52,10 @@ namespace BlackMisc
switch (i)
{
case IndexIntensity:
setIntensity(static_cast<Intensity>(variant.toInt()));
setIntensity(variant.value<Intensity>());
break;
case IndexDescriptor:
setDescriptor(static_cast<Descriptor>(variant.toInt()));
setDescriptor(variant.value<Descriptor>());
break;
case IndexWeatherPhenomena:
setWeatherPhenomena(variant.toInt());

5
src/blackmisc/weather/presentweather.h
View File

@@ -88,6 +88,9 @@ namespace BlackMisc
IndexWeatherPhenomena
};
//! \copydoc BlackMisc::CValueObject::registerMetadata
static void registerMetadata();
//! Default constructor.
CPresentWeather() = default;
@@ -132,6 +135,8 @@ namespace BlackMisc
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Weather::CPresentWeather)
Q_DECLARE_METATYPE(BlackMisc::Weather::CPresentWeather::Intensity)
Q_DECLARE_METATYPE(BlackMisc::Weather::CPresentWeather::Descriptor)
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Weather::CPresentWeather, (
attr(o.m_intensity),
attr(o.m_descriptor),