Use C++17 nested namespaces

2026-04-03 15:45:46 +08:00 · 2022-04-29 22:31:49 +02:00
parent d1f41daba2
commit f5d3d59a86
6 changed files with 154 additions and 173 deletions
--- 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<CSimulatorSettings::CGSource>();
-            qRegisterMetaType<CAircraftMatcherSetup::MatchingAlgorithm>();
-            qRegisterMetaType<CAircraftMatcherSetup::MatchingMode>();
-            qRegisterMetaType<CAircraftMatcherSetup::MatchingModeFlag>();
-            qRegisterMetaType<CAircraftMatcherSetup::PickSimilarStrategy>();
-            qRegisterMetaType<MatchingLog>();
-            qRegisterMetaType<MatchingLogFlag>();
-            qRegisterMetaType<ReverseLookupLoggingFlag>();
-            qRegisterMetaType<ReverseLookupLogging>();
+        qRegisterMetaType<CSimulatorSettings::CGSource>();
+        qRegisterMetaType<CAircraftMatcherSetup::MatchingAlgorithm>();
+        qRegisterMetaType<CAircraftMatcherSetup::MatchingMode>();
+        qRegisterMetaType<CAircraftMatcherSetup::MatchingModeFlag>();
+        qRegisterMetaType<CAircraftMatcherSetup::PickSimilarStrategy>();
+        qRegisterMetaType<MatchingLog>();
+        qRegisterMetaType<MatchingLogFlag>();
+        qRegisterMetaType<ReverseLookupLoggingFlag>();
+        qRegisterMetaType<ReverseLookupLogging>();

-            // the ones generate with Q_DECLARE_FLAGS and no streamin operator fail here
-            qDBusRegisterMetaType<CSimulatorSettings::CGSource>();
-            qDBusRegisterMetaType<CInterpolationAndRenderingSetupBase::InterpolatorMode>();
-            qDBusRegisterMetaType<CAircraftMatcherSetup::MatchingAlgorithm>();
-            qDBusRegisterMetaType<CAircraftMatcherSetup::MatchingModeFlag>();
-            qDBusRegisterMetaType<CAircraftMatcherSetup::PickSimilarStrategy>();
-            qDBusRegisterMetaType<MatchingLogFlag>();
-            qDBusRegisterMetaType<MatchingLog>();
-            qDBusRegisterMetaType<ReverseLookupLoggingFlag>();
-            qDBusRegisterMetaType<ReverseLookupLogging>();
+        // the ones generate with Q_DECLARE_FLAGS and no streamin operator fail here
+        qDBusRegisterMetaType<CSimulatorSettings::CGSource>();
+        qDBusRegisterMetaType<CInterpolationAndRenderingSetupBase::InterpolatorMode>();
+        qDBusRegisterMetaType<CAircraftMatcherSetup::MatchingAlgorithm>();
+        qDBusRegisterMetaType<CAircraftMatcherSetup::MatchingModeFlag>();
+        qDBusRegisterMetaType<CAircraftMatcherSetup::PickSimilarStrategy>();
+        qDBusRegisterMetaType<MatchingLogFlag>();
+        qDBusRegisterMetaType<MatchingLog>();
+        qDBusRegisterMetaType<ReverseLookupLoggingFlag>();
+        qDBusRegisterMetaType<ReverseLookupLogging>();

-            qRegisterMetaTypeStreamOperators<CSimulatorSettings::CGSource>();
-            qRegisterMetaTypeStreamOperators<CInterpolationAndRenderingSetupBase::InterpolatorMode>();
-            qRegisterMetaTypeStreamOperators<CAircraftMatcherSetup::MatchingAlgorithm>();
-            qRegisterMetaTypeStreamOperators<CAircraftMatcherSetup::MatchingModeFlag>();
-            qRegisterMetaTypeStreamOperators<MatchingLogFlag>();
-            qRegisterMetaTypeStreamOperators<MatchingLog>();
-            qRegisterMetaTypeStreamOperators<CAircraftMatcherSetup::PickSimilarStrategy>();
-            qRegisterMetaTypeStreamOperators<ReverseLookupLoggingFlag>();
-            qRegisterMetaTypeStreamOperators<ReverseLookupLogging>();
-        }
+        qRegisterMetaTypeStreamOperators<CSimulatorSettings::CGSource>();
+        qRegisterMetaTypeStreamOperators<CInterpolationAndRenderingSetupBase::InterpolatorMode>();
+        qRegisterMetaTypeStreamOperators<CAircraftMatcherSetup::MatchingAlgorithm>();
+        qRegisterMetaTypeStreamOperators<CAircraftMatcherSetup::MatchingModeFlag>();
+        qRegisterMetaTypeStreamOperators<MatchingLogFlag>();
+        qRegisterMetaTypeStreamOperators<MatchingLog>();
+        qRegisterMetaTypeStreamOperators<CAircraftMatcherSetup::PickSimilarStrategy>();
+        qRegisterMetaTypeStreamOperators<ReverseLookupLoggingFlag>();
+        qRegisterMetaTypeStreamOperators<ReverseLookupLogging>();
    }

 } // ns