From f5d3d59a860f005adae8730428c815d7b6fca675 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Fri, 29 Apr 2022 22:31:49 +0200 Subject: [PATCH] Use C++17 nested namespaces --- src/blackmisc/aviation/selcal.h | 98 +++++++------- src/blackmisc/db/registermetadatadb.cpp | 23 ++-- src/blackmisc/geo/registermetadatageo.cpp | 17 +-- src/blackmisc/input/registermetadatainput.cpp | 25 ++-- .../simulation/registermetadatasimulation.cpp | 123 +++++++++--------- .../weather/registermetadataweather.cpp | 41 +++--- 6 files changed, 154 insertions(+), 173 deletions(-) diff --git a/src/blackmisc/aviation/selcal.h b/src/blackmisc/aviation/selcal.h index d324d67c9..0b02abfe7 100644 --- a/src/blackmisc/aviation/selcal.h +++ b/src/blackmisc/aviation/selcal.h @@ -23,75 +23,71 @@ class QStringList; BLACK_DECLARE_VALUEOBJECT_MIXINS(BlackMisc::Aviation, CSelcal) - -namespace BlackMisc +namespace BlackMisc::PhysicalQuantities { class CFrequency; } +namespace BlackMisc::Aviation { - namespace PhysicalQuantities { class CFrequency; } - namespace Aviation + /*! + * Value object for SELCAL. + * \see http://en.wikipedia.org/wiki/SELCAL + * \see http://www.asri.aero/our-services/selcal/ User Guide + */ + class BLACKMISC_EXPORT CSelcal : public CValueObject { - /*! - * Value object for SELCAL. - * \see http://en.wikipedia.org/wiki/SELCAL - * \see http://www.asri.aero/our-services/selcal/ User Guide - */ - class BLACKMISC_EXPORT CSelcal : public CValueObject - { - public: - //! Default constructor. - CSelcal() = default; + public: + //! Default constructor. + CSelcal() = default; - //! Constructor. - CSelcal(const QString &code) : m_code(unifyCode(code)) {} + //! Constructor. + CSelcal(const QString &code) : m_code(unifyCode(code)) {} - //! Constructor needed to disambiguate implicit conversion from string literal. - CSelcal(const char *code) : m_code(unifyCode(code)) {} + //! Constructor needed to disambiguate implicit conversion from string literal. + CSelcal(const char *code) : m_code(unifyCode(code)) {} - //! Is valid? - bool isValid() const { return isValidCode(m_code); } + //! Is valid? + bool isValid() const { return isValidCode(m_code); } - //! Get SELCAL code - const QString &getCode() const { return m_code; } + //! Get SELCAL code + const QString &getCode() const { return m_code; } - //! List of 4 frequencies, if list is empty SELCAL code is not valid - //! \return either 4 frequencies, or empty list - QList getFrequencies() const; + //! List of 4 frequencies, if list is empty SELCAL code is not valid + //! \return either 4 frequencies, or empty list + QList getFrequencies() const; - //! Equals given string - bool equalsString(const QString &code) const; + //! Equals given string + bool equalsString(const QString &code) const; - //! \copydoc BlackMisc::Mixin::String::toQString - QString convertToQString(bool i18n = false) const; + //! \copydoc BlackMisc::Mixin::String::toQString + QString convertToQString(bool i18n = false) const; - //! Valid SELCAL characters - static const QString &validCharacters(); + //! Valid SELCAL characters + static const QString &validCharacters(); - //! Is given character a valid SELCAL characer? - static bool isValidCharacter(QChar c); + //! Is given character a valid SELCAL characer? + static bool isValidCharacter(QChar c); - //! Valid SELCAL code? - static bool isValidCode(const QString &code); + //! Valid SELCAL code? + static bool isValidCode(const QString &code); - //! All valid code pairs: AB, AC, AD ... - static const QStringList &codePairs(); + //! All valid code pairs: AB, AC, AD ... + static const QStringList &codePairs(); - //! Unify SELCAL code by removing illegal characters - static QString unifyCode(const QString &selcalCandidate); + //! Unify SELCAL code by removing illegal characters + static QString unifyCode(const QString &selcalCandidate); - private: - //! Audio frequency for character - static const PhysicalQuantities::CFrequency &audioFrequencyEquivalent(QChar c); + private: + //! Audio frequency for character + static const PhysicalQuantities::CFrequency &audioFrequencyEquivalent(QChar c); - //! All audio frequencies - static const QList &audioFrequencyEquivalents(); + //! All audio frequencies + static const QList &audioFrequencyEquivalents(); - QString m_code; + QString m_code; - BLACK_METACLASS( - CSelcal, - BLACK_METAMEMBER(code) - ); - }; - } // namespace + BLACK_METACLASS( + CSelcal, + BLACK_METAMEMBER(code) + ); + }; } // namespace Q_DECLARE_METATYPE(BlackMisc::Aviation::CSelcal) diff --git a/src/blackmisc/db/registermetadatadb.cpp b/src/blackmisc/db/registermetadatadb.cpp index 5186a9b65..f11845881 100644 --- a/src/blackmisc/db/registermetadatadb.cpp +++ b/src/blackmisc/db/registermetadatadb.cpp @@ -9,7 +9,6 @@ #include "blackmisc/db/registermetadatadb.h" #include "blackmisc/variant.h" -namespace BlackMisc // DB headers #include "blackmisc/db/dbinfolist.h" #include "blackmisc/db/dbinfo.h" @@ -20,20 +19,18 @@ namespace BlackMisc #include "blackmisc/db/artifactlist.h" #include "blackmisc/db/updateinfo.h" +namespace BlackMisc::Db { - namespace Db + void registerMetadata() { - void registerMetadata() - { - CDbFlags::registerMetadata(); - CDbInfo::registerMetadata(); - CDbInfoList::registerMetadata(); - CArtifact::registerMetadata(); - CArtifactList::registerMetadata(); - CDistribution::registerMetadata(); - CDistributionList::registerMetadata(); - CUpdateInfo::registerMetadata(); - } + CDbFlags::registerMetadata(); + CDbInfo::registerMetadata(); + CDbInfoList::registerMetadata(); + CArtifact::registerMetadata(); + CArtifactList::registerMetadata(); + CDistribution::registerMetadata(); + CDistributionList::registerMetadata(); + CUpdateInfo::registerMetadata(); } } // ns diff --git a/src/blackmisc/geo/registermetadatageo.cpp b/src/blackmisc/geo/registermetadatageo.cpp index 70cce4402..1521f8903 100644 --- a/src/blackmisc/geo/registermetadatageo.cpp +++ b/src/blackmisc/geo/registermetadatageo.cpp @@ -8,7 +8,6 @@ #include "blackmisc/geo/registermetadatageo.h" -namespace BlackMisc // Geo headers #include "blackmisc/geo/latitude.h" #include "blackmisc/geo/longitude.h" @@ -16,17 +15,15 @@ namespace BlackMisc #include "blackmisc/geo/coordinategeodeticlist.h" #include "blackmisc/geo/elevationplane.h" +namespace BlackMisc::Geo { - namespace Geo + void registerMetadata() { - void registerMetadata() - { - CCoordinateGeodetic::registerMetadata(); - CCoordinateGeodeticList::registerMetadata(); - CLatitude::registerMetadata(); - CLongitude::registerMetadata(); - CElevationPlane::registerMetadata(); - } + CCoordinateGeodetic::registerMetadata(); + CCoordinateGeodeticList::registerMetadata(); + CLatitude::registerMetadata(); + CLongitude::registerMetadata(); + CElevationPlane::registerMetadata(); } } // ns diff --git a/src/blackmisc/input/registermetadatainput.cpp b/src/blackmisc/input/registermetadatainput.cpp index 43438a3d0..0116c9ff7 100644 --- a/src/blackmisc/input/registermetadatainput.cpp +++ b/src/blackmisc/input/registermetadatainput.cpp @@ -16,22 +16,19 @@ #include -namespace BlackMisc +namespace BlackMisc::Input { - namespace Input + void registerMetadata() { - void registerMetadata() - { - CActionHotkey::registerMetadata(); - CActionHotkeyList::registerMetadata(); - CHotkeyCombination::registerMetadata(); - CJoystickButton::registerMetadata(); - CJoystickButtonList::registerMetadata(); - CKeyboardKey::registerMetadata(); - CKeyboardKeyList::registerMetadata(); - qDBusRegisterMetaType(); - qRegisterMetaTypeStreamOperators(); - } + CActionHotkey::registerMetadata(); + CActionHotkeyList::registerMetadata(); + CHotkeyCombination::registerMetadata(); + CJoystickButton::registerMetadata(); + CJoystickButtonList::registerMetadata(); + CKeyboardKey::registerMetadata(); + CKeyboardKeyList::registerMetadata(); + qDBusRegisterMetaType(); + qRegisterMetaTypeStreamOperators(); } } // ns diff --git a/src/blackmisc/simulation/registermetadatasimulation.cpp b/src/blackmisc/simulation/registermetadatasimulation.cpp index cb41b23e2..9863b9beb 100644 --- a/src/blackmisc/simulation/registermetadatasimulation.cpp +++ b/src/blackmisc/simulation/registermetadatasimulation.cpp @@ -40,74 +40,71 @@ using namespace BlackMisc::Simulation::Fsx; using namespace BlackMisc::Simulation::FsCommon; using namespace BlackMisc::Simulation::Settings; -namespace BlackMisc +namespace BlackMisc::Simulation { - namespace Simulation + void registerMetadata() { - void registerMetadata() - { - CAircraftCfgEntries::registerMetadata(); - CAircraftCfgEntriesList::registerMetadata(); - CAircraftModel::registerMetadata(); - CAircraftModelList::registerMetadata(); - CAirspaceAircraftSnapshot::registerMetadata(); - CDistributor::registerMetadata(); - CDistributorList::registerMetadata(); - CDistributorListPreferences::registerMetadata(); - CInterpolationAndRenderingSetupPerCallsign::registerMetadata(); - CInterpolationAndRenderingSetupGlobal::registerMetadata(); - CInterpolationSetupList::registerMetadata(); - CMatchingStatisticsEntry::registerMetadata(); - CMatchingStatistics::registerMetadata(); - CModelSettings::registerMetadata(); - CSimConnectUtilities::registerMetadata(); - CSimulatedAircraft::registerMetadata(); - CSimulatedAircraftList::registerMetadata(); - CSimulatorInfo::registerMetadata(); - CSimulatorInfoList::registerMetadata(); - CSimulatorInternals::registerMetadata(); - CSimulatorMessagesSettings::registerMetadata(); - CSimulatorPluginInfo::registerMetadata(); - CSimulatorPluginInfoList::registerMetadata(); - CSimulatorSettings::registerMetadata(); - CFsxP3DSettings::registerMetadata(); - CSwiftPluginSettings::registerMetadata(); - CVPilotModelRule::registerMetadata(); - CVPilotModelRuleSet::registerMetadata(); - CAircraftMatcherSetup::registerMetadata(); - CXSwiftBusSettings::registerMetadata(); + CAircraftCfgEntries::registerMetadata(); + CAircraftCfgEntriesList::registerMetadata(); + CAircraftModel::registerMetadata(); + CAircraftModelList::registerMetadata(); + CAirspaceAircraftSnapshot::registerMetadata(); + CDistributor::registerMetadata(); + CDistributorList::registerMetadata(); + CDistributorListPreferences::registerMetadata(); + CInterpolationAndRenderingSetupPerCallsign::registerMetadata(); + CInterpolationAndRenderingSetupGlobal::registerMetadata(); + CInterpolationSetupList::registerMetadata(); + CMatchingStatisticsEntry::registerMetadata(); + CMatchingStatistics::registerMetadata(); + CModelSettings::registerMetadata(); + CSimConnectUtilities::registerMetadata(); + CSimulatedAircraft::registerMetadata(); + CSimulatedAircraftList::registerMetadata(); + CSimulatorInfo::registerMetadata(); + CSimulatorInfoList::registerMetadata(); + CSimulatorInternals::registerMetadata(); + CSimulatorMessagesSettings::registerMetadata(); + CSimulatorPluginInfo::registerMetadata(); + CSimulatorPluginInfoList::registerMetadata(); + CSimulatorSettings::registerMetadata(); + CFsxP3DSettings::registerMetadata(); + CSwiftPluginSettings::registerMetadata(); + CVPilotModelRule::registerMetadata(); + CVPilotModelRuleSet::registerMetadata(); + CAircraftMatcherSetup::registerMetadata(); + CXSwiftBusSettings::registerMetadata(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); - qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); + qRegisterMetaType(); - // the ones generate with Q_DECLARE_FLAGS and no streamin operator fail here - qDBusRegisterMetaType(); - qDBusRegisterMetaType(); - qDBusRegisterMetaType(); - qDBusRegisterMetaType(); - qDBusRegisterMetaType(); - qDBusRegisterMetaType(); - qDBusRegisterMetaType(); - qDBusRegisterMetaType(); - qDBusRegisterMetaType(); + // the ones generate with Q_DECLARE_FLAGS and no streamin operator fail here + qDBusRegisterMetaType(); + qDBusRegisterMetaType(); + qDBusRegisterMetaType(); + qDBusRegisterMetaType(); + qDBusRegisterMetaType(); + qDBusRegisterMetaType(); + qDBusRegisterMetaType(); + qDBusRegisterMetaType(); + qDBusRegisterMetaType(); - qRegisterMetaTypeStreamOperators(); - qRegisterMetaTypeStreamOperators(); - qRegisterMetaTypeStreamOperators(); - qRegisterMetaTypeStreamOperators(); - qRegisterMetaTypeStreamOperators(); - qRegisterMetaTypeStreamOperators(); - qRegisterMetaTypeStreamOperators(); - qRegisterMetaTypeStreamOperators(); - qRegisterMetaTypeStreamOperators(); - } + qRegisterMetaTypeStreamOperators(); + qRegisterMetaTypeStreamOperators(); + qRegisterMetaTypeStreamOperators(); + qRegisterMetaTypeStreamOperators(); + qRegisterMetaTypeStreamOperators(); + qRegisterMetaTypeStreamOperators(); + qRegisterMetaTypeStreamOperators(); + qRegisterMetaTypeStreamOperators(); + qRegisterMetaTypeStreamOperators(); } } // ns diff --git a/src/blackmisc/weather/registermetadataweather.cpp b/src/blackmisc/weather/registermetadataweather.cpp index ebdad5cc6..0dd622d19 100644 --- a/src/blackmisc/weather/registermetadataweather.cpp +++ b/src/blackmisc/weather/registermetadataweather.cpp @@ -10,7 +10,6 @@ #include "blackmisc/valueobject.h" #include "blackmisc/variant.h" -namespace BlackMisc // Weather headers #include "blackmisc/weather/cloudlayer.h" #include "blackmisc/weather/cloudlayerlist.h" @@ -30,29 +29,27 @@ namespace BlackMisc #include "blackmisc/weather/windlayer.h" #include "blackmisc/weather/windlayerlist.h" +namespace BlackMisc::Weather { - namespace Weather + void registerMetadata() { - void registerMetadata() - { - CCloudLayer::registerMetadata(); - CCloudLayerList::registerMetadata(); - CGridPoint::registerMetadata(); - CMetar::registerMetadata(); - CMetarList::registerMetadata(); - CPresentWeather::registerMetadata(); - CPresentWeatherList::registerMetadata(); - CTemperatureLayer::registerMetadata(); - CTemperatureLayerList::registerMetadata(); - CVisibilityLayer::registerMetadata(); - CVisibilityLayerList::registerMetadata(); - CWeatherDataPluginInfo::registerMetadata(); - CWeatherDataPluginInfoList::registerMetadata(); - CWeatherGrid::registerMetadata(); - CWeatherScenario::registerMetadata(); - CWindLayer::registerMetadata(); - CWindLayerList::registerMetadata(); - } + CCloudLayer::registerMetadata(); + CCloudLayerList::registerMetadata(); + CGridPoint::registerMetadata(); + CMetar::registerMetadata(); + CMetarList::registerMetadata(); + CPresentWeather::registerMetadata(); + CPresentWeatherList::registerMetadata(); + CTemperatureLayer::registerMetadata(); + CTemperatureLayerList::registerMetadata(); + CVisibilityLayer::registerMetadata(); + CVisibilityLayerList::registerMetadata(); + CWeatherDataPluginInfo::registerMetadata(); + CWeatherDataPluginInfoList::registerMetadata(); + CWeatherGrid::registerMetadata(); + CWeatherScenario::registerMetadata(); + CWindLayer::registerMetadata(); + CWindLayerList::registerMetadata(); } } // ns