mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-30 20:15:35 +08:00
refactor: Rename remaining "black" identifiers
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
|
||||
using namespace swift::misc::aviation;
|
||||
|
||||
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CCloudLayer)
|
||||
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CCloudLayer)
|
||||
|
||||
namespace swift::misc::weather
|
||||
{
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <QMetaType>
|
||||
#include <QString>
|
||||
|
||||
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CCloudLayer)
|
||||
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CCloudLayer)
|
||||
|
||||
namespace swift::misc::weather
|
||||
{
|
||||
@@ -142,15 +142,14 @@ namespace swift::misc::weather
|
||||
Clouds m_clouds = NoClouds;
|
||||
int m_coveragePercent;
|
||||
|
||||
BLACK_METACLASS(
|
||||
SWIFT_METACLASS(
|
||||
CCloudLayer,
|
||||
BLACK_METAMEMBER(base),
|
||||
BLACK_METAMEMBER(top),
|
||||
BLACK_METAMEMBER(precipitationRate),
|
||||
BLACK_METAMEMBER(precipitation),
|
||||
BLACK_METAMEMBER(clouds),
|
||||
BLACK_METAMEMBER(coveragePercent)
|
||||
);
|
||||
SWIFT_METAMEMBER(base),
|
||||
SWIFT_METAMEMBER(top),
|
||||
SWIFT_METAMEMBER(precipitationRate),
|
||||
SWIFT_METAMEMBER(precipitation),
|
||||
SWIFT_METAMEMBER(clouds),
|
||||
SWIFT_METAMEMBER(coveragePercent));
|
||||
};
|
||||
} // namespace
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
using namespace swift::misc::aviation;
|
||||
|
||||
BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CCloudLayer, CCloudLayerList)
|
||||
SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CCloudLayer, CCloudLayerList)
|
||||
|
||||
namespace swift::misc::weather
|
||||
{
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <initializer_list>
|
||||
#include <tuple>
|
||||
|
||||
BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CCloudLayer, CCloudLayerList)
|
||||
SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CCloudLayer, CCloudLayerList)
|
||||
|
||||
namespace swift::misc
|
||||
{
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
using namespace swift::misc::physical_quantities;
|
||||
using namespace swift::misc::aviation;
|
||||
|
||||
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CMetar)
|
||||
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CMetar)
|
||||
|
||||
namespace swift::misc::weather
|
||||
{
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <QMetaType>
|
||||
#include <QString>
|
||||
|
||||
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CMetar)
|
||||
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CMetar)
|
||||
|
||||
namespace swift::misc::weather
|
||||
{
|
||||
@@ -155,22 +155,21 @@ namespace swift::misc::weather
|
||||
physical_quantities::CTemperature m_dewPoint;
|
||||
physical_quantities::CPressure m_altimeter;
|
||||
|
||||
BLACK_METACLASS(
|
||||
SWIFT_METACLASS(
|
||||
CMetar,
|
||||
BLACK_METAMEMBER(metarMessage),
|
||||
BLACK_METAMEMBER(reportType),
|
||||
BLACK_METAMEMBER(airport),
|
||||
BLACK_METAMEMBER(reportDay),
|
||||
BLACK_METAMEMBER(reportTime),
|
||||
BLACK_METAMEMBER(isAutomated),
|
||||
BLACK_METAMEMBER(windLayer),
|
||||
BLACK_METAMEMBER(visibility),
|
||||
BLACK_METAMEMBER(presentWeathers),
|
||||
BLACK_METAMEMBER(cloudLayers),
|
||||
BLACK_METAMEMBER(temperature),
|
||||
BLACK_METAMEMBER(dewPoint),
|
||||
BLACK_METAMEMBER(altimeter)
|
||||
);
|
||||
SWIFT_METAMEMBER(metarMessage),
|
||||
SWIFT_METAMEMBER(reportType),
|
||||
SWIFT_METAMEMBER(airport),
|
||||
SWIFT_METAMEMBER(reportDay),
|
||||
SWIFT_METAMEMBER(reportTime),
|
||||
SWIFT_METAMEMBER(isAutomated),
|
||||
SWIFT_METAMEMBER(windLayer),
|
||||
SWIFT_METAMEMBER(visibility),
|
||||
SWIFT_METAMEMBER(presentWeathers),
|
||||
SWIFT_METAMEMBER(cloudLayers),
|
||||
SWIFT_METAMEMBER(temperature),
|
||||
SWIFT_METAMEMBER(dewPoint),
|
||||
SWIFT_METAMEMBER(altimeter));
|
||||
};
|
||||
} // namespace
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <tuple>
|
||||
|
||||
BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CMetar, CMetarList)
|
||||
SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CMetar, CMetarList)
|
||||
|
||||
namespace swift::misc::weather
|
||||
{
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <QMetaType>
|
||||
#include <QString>
|
||||
|
||||
BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CMetar, CMetarList)
|
||||
SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CMetar, CMetarList)
|
||||
|
||||
namespace swift::misc::weather
|
||||
{
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include "misc/weather/presentweather.h"
|
||||
#include "misc/propertyindexref.h"
|
||||
|
||||
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CPresentWeather)
|
||||
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CPresentWeather)
|
||||
|
||||
namespace swift::misc::weather
|
||||
{
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <QString>
|
||||
#include <tuple>
|
||||
|
||||
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CPresentWeather)
|
||||
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CPresentWeather)
|
||||
|
||||
namespace swift::misc::weather
|
||||
{
|
||||
@@ -128,12 +128,11 @@ namespace swift::misc::weather
|
||||
Descriptor m_descriptor = None;
|
||||
int m_weatherPhenomena;
|
||||
|
||||
BLACK_METACLASS(
|
||||
SWIFT_METACLASS(
|
||||
CPresentWeather,
|
||||
BLACK_METAMEMBER(intensity),
|
||||
BLACK_METAMEMBER(descriptor),
|
||||
BLACK_METAMEMBER(weatherPhenomena)
|
||||
);
|
||||
SWIFT_METAMEMBER(intensity),
|
||||
SWIFT_METAMEMBER(descriptor),
|
||||
SWIFT_METAMEMBER(weatherPhenomena));
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "misc/weather/presentweatherlist.h"
|
||||
|
||||
BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CPresentWeather, CPresentWeatherList)
|
||||
SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CPresentWeather, CPresentWeatherList)
|
||||
|
||||
namespace swift::misc::weather
|
||||
{
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <QMetaType>
|
||||
|
||||
BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CPresentWeather, CPresentWeatherList)
|
||||
SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CPresentWeather, CPresentWeatherList)
|
||||
|
||||
namespace swift::misc::weather
|
||||
{
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
using namespace swift::misc::physical_quantities;
|
||||
using namespace swift::misc::aviation;
|
||||
|
||||
BLACK_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CWindLayer)
|
||||
SWIFT_DEFINE_VALUEOBJECT_MIXINS(swift::misc::weather, CWindLayer)
|
||||
|
||||
namespace swift::misc::weather
|
||||
{
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <QMetaType>
|
||||
#include <QString>
|
||||
|
||||
BLACK_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CWindLayer)
|
||||
SWIFT_DECLARE_VALUEOBJECT_MIXINS(swift::misc::weather, CWindLayer)
|
||||
|
||||
namespace swift::misc::weather
|
||||
{
|
||||
@@ -114,16 +114,15 @@ namespace swift::misc::weather
|
||||
physical_quantities::CSpeed m_speed;
|
||||
physical_quantities::CSpeed m_gustSpeed;
|
||||
|
||||
BLACK_METACLASS(
|
||||
SWIFT_METACLASS(
|
||||
CWindLayer,
|
||||
BLACK_METAMEMBER(level),
|
||||
BLACK_METAMEMBER(directionMain),
|
||||
BLACK_METAMEMBER(directionFrom),
|
||||
BLACK_METAMEMBER(directionTo),
|
||||
BLACK_METAMEMBER(directionVariable),
|
||||
BLACK_METAMEMBER(speed),
|
||||
BLACK_METAMEMBER(gustSpeed)
|
||||
);
|
||||
SWIFT_METAMEMBER(level),
|
||||
SWIFT_METAMEMBER(directionMain),
|
||||
SWIFT_METAMEMBER(directionFrom),
|
||||
SWIFT_METAMEMBER(directionTo),
|
||||
SWIFT_METAMEMBER(directionVariable),
|
||||
SWIFT_METAMEMBER(speed),
|
||||
SWIFT_METAMEMBER(gustSpeed));
|
||||
};
|
||||
|
||||
} // namespace
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
using namespace swift::misc::aviation;
|
||||
|
||||
BLACK_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CWindLayer, CWindLayerList)
|
||||
SWIFT_DEFINE_SEQUENCE_MIXINS(swift::misc::weather, CWindLayer, CWindLayerList)
|
||||
|
||||
namespace swift::misc::weather
|
||||
{
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <initializer_list>
|
||||
#include <tuple>
|
||||
|
||||
BLACK_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CWindLayer, CWindLayerList)
|
||||
SWIFT_DECLARE_SEQUENCE_MIXINS(swift::misc::weather, CWindLayer, CWindLayerList)
|
||||
|
||||
namespace swift::misc
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user