Application refactoring

src/core/CMakeLists.txt

@@ -3,38 +3,38 @@
 
 add_library(core SHARED
         # AFV
-        afv/audio/output.h
-        afv/audio/output.cpp
         afv/audio/callsigndelaycache.cpp
-        afv/audio/soundcardsampleprovider.h
-        afv/audio/callsignsampleprovider.h
         afv/audio/callsigndelaycache.h
-        afv/audio/soundcardsampleprovider.cpp
-        afv/audio/receiversampleprovider.cpp
         afv/audio/callsignsampleprovider.cpp
-        afv/audio/input.h
+        afv/audio/callsignsampleprovider.h
         afv/audio/input.cpp
+        afv/audio/input.h
+        afv/audio/output.cpp
+        afv/audio/output.h
+        afv/audio/receiversampleprovider.cpp
         afv/audio/receiversampleprovider.h
-        afv/crypto/cryptodtochannel.cpp
-        afv/crypto/cryptodtoserializer.cpp
-        afv/crypto/cryptodtomode.h
-        afv/crypto/cryptodtochannel.h
-        afv/crypto/cryptodtoserializer.h
-        afv/crypto/cryptodtoheaderdto.h
-        afv/model/atcstationmodel.h
-        afv/model/atcstationmodel.cpp
-        afv/model/afvmapreader.h
-        afv/model/afvmapreader.cpp
-        afv/dto.h
-        afv/clients/afvclient.h
+        afv/audio/soundcardsampleprovider.cpp
+        afv/audio/soundcardsampleprovider.h
         afv/clients/afvclient.cpp
-        afv/connection/clientconnection.h
+        afv/clients/afvclient.h
         afv/connection/apiserverconnection.cpp
         afv/connection/apiserverconnection.h
         afv/connection/clientconnection.cpp
+        afv/connection/clientconnection.h
         afv/connection/clientconnectiondata.cpp
         afv/connection/clientconnectiondata.h
         afv/constants.h
+        afv/crypto/cryptodtochannel.cpp
+        afv/crypto/cryptodtochannel.h
+        afv/crypto/cryptodtoheaderdto.h
+        afv/crypto/cryptodtomode.h
+        afv/crypto/cryptodtoserializer.cpp
+        afv/crypto/cryptodtoserializer.h
+        afv/dto.h
+        afv/model/afvmapreader.cpp
+        afv/model/afvmapreader.h
+        afv/model/atcstationmodel.cpp
+        afv/model/atcstationmodel.h
 
         # Application
         application/applicationsettings.h
@@ -44,42 +44,42 @@ add_library(core SHARED
         audio/audiosettings.h
 
         # Context
-        context/contextapplicationproxy.cpp
-        context/contextownaircraftproxy.h
+        context/context.cpp
         context/context.h
-        context/contextsimulator.h
-        context/contextaudio.cpp
-        context/contextaudio.h
-        context/contextapplicationimpl.cpp
-        context/contextsimulatorproxy.cpp
-        context/contextownaircraft.h
-        context/contextownaircraftimpl.cpp
-        context/contextnetwork.cpp
-        context/contextapplication.h
-        context/contextsimulatorempty.h
         context/contextapplication.cpp
-        context/contextaudioimpl.cpp
+        context/contextapplication.h
         context/contextapplicationempty.h
-        context/contextownaircraft.cpp
-        context/contextnetworkproxy.h
-        context/contextsimulatorimpl.cpp
-        context/contextapplicationproxy.h
+        context/contextapplicationimpl.cpp
         context/contextapplicationimpl.h
-        context/contextsimulatorproxy.h
-        context/contextaudioproxy.h
+        context/contextapplicationproxy.cpp
+        context/contextapplicationproxy.h
+        context/contextaudio.cpp
+        context/contextaudio.h
+        context/contextaudioimpl.cpp
         context/contextaudioimpl.h
-        context/contextownaircraftproxy.cpp
-        context/contextsimulator.cpp
         context/contextaudioproxy.cpp
+        context/contextaudioproxy.h
+        context/contextnetwork.cpp
         context/contextnetwork.h
-        context/context.cpp
         context/contextnetworkempty.h
-        context/contextnetworkproxy.cpp
-        context/contextownaircraftimpl.h
-        context/contextsimulatorimpl.h
         context/contextnetworkimpl.cpp
         context/contextnetworkimpl.h
+        context/contextnetworkproxy.cpp
+        context/contextnetworkproxy.h
+        context/contextownaircraft.cpp
+        context/contextownaircraft.h
         context/contextownaircraftempty.h
+        context/contextownaircraftimpl.cpp
+        context/contextownaircraftimpl.h
+        context/contextownaircraftproxy.cpp
+        context/contextownaircraftproxy.h
+        context/contextsimulator.cpp
+        context/contextsimulator.h
+        context/contextsimulatorempty.h
+        context/contextsimulatorimpl.cpp
+        context/contextsimulatorimpl.h
+        context/contextsimulatorproxy.cpp
+        context/contextsimulatorproxy.h
 
         # Data
         data/authenticateduser.h
@@ -94,110 +94,110 @@ add_library(core SHARED
         data/vatsimsetup.h
 
         # DB
-        db/backgrounddataupdater.cpp
         db/airportdatareader.cpp
-        db/databaseutils.h
-        db/modeldatareader.h
-        db/infodatareader.h
-        db/databasereader.h
-        db/databaseauthentication.cpp
-        db/databasewriter.cpp
-        db/databasereaderconfig.h
+        db/airportdatareader.h
+        db/backgrounddataupdater.cpp
         db/backgrounddataupdater.h
-        db/databaseutils.cpp
-        db/modeldatareader.cpp
+        db/databaseauthentication.cpp
+        db/databaseauthentication.h
         db/databasereader.cpp
+        db/databasereader.h
         db/databasereaderconfig.cpp
-        db/infodatareader.cpp
+        db/databasereaderconfig.h
+        db/databaseutils.cpp
+        db/databaseutils.h
+        db/databasewriter.cpp
+        db/databasewriter.h
         db/icaodatareader.cpp
-        db/databaseauthentication.h
         db/icaodatareader.h
-        db/databasewriter.h
-        db/airportdatareader.h
+        db/infodatareader.cpp
+        db/infodatareader.h
+        db/modeldatareader.cpp
+        db/modeldatareader.h
 
         # FSD
-        fsd/fsdidentification.cpp
-        fsd/clientresponse.cpp
-        fsd/planeinforequestfsinn.cpp
-        fsd/textmessage.cpp
-        fsd/killrequest.cpp
-        fsd/revbclientparts.cpp
+        fsd/addatc.cpp
+        fsd/addatc.h
+        fsd/addpilot.cpp
+        fsd/addpilot.h
+        fsd/atcdataupdate.cpp
+        fsd/atcdataupdate.h
+        fsd/authchallenge.cpp
+        fsd/authchallenge.h
+        fsd/authresponse.cpp
+        fsd/authresponse.h
         fsd/clientidentification.cpp
-        fsd/visualpilotdatatoggle.h
-        fsd/rehost.h
-        fsd/visualpilotdataupdate.cpp
-        fsd/planeinformationfsinn.h
+        fsd/clientidentification.h
+        fsd/clientquery.cpp
         fsd/clientquery.h
+        fsd/clientresponse.cpp
+        fsd/clientresponse.h
+        fsd/deleteatc.cpp
+        fsd/deleteatc.h
+        fsd/deletepilot.cpp
+        fsd/deletepilot.h
+        fsd/enums.h
+        fsd/euroscopesimdata.cpp
+        fsd/euroscopesimdata.h
         fsd/flightplan.cpp
-        fsd/pong.cpp
-        fsd/planeinformationfsinn.cpp
-        fsd/addatc.h
-        fsd/servererror.h
-        fsd/servererror.cpp
+        fsd/flightplan.h
         fsd/fsdclient.cpp
-        fsd/atcdataupdate.h
-        fsd/authchallenge.h
-        fsd/atcdataupdate.cpp
-        fsd/ping.h
-        fsd/messagebase.h
-        fsd/visualpilotdataupdate.h
-        fsd/rehost.cpp
+        fsd/fsdclient.h
+        fsd/fsdidentification.cpp
+        fsd/fsdidentification.h
+        fsd/interimpilotdataupdate.cpp
         fsd/interimpilotdataupdate.h
-        fsd/authresponse.h
-        fsd/addatc.cpp
-        fsd/textmessage.h
-        fsd/visualpilotdataperiodic.cpp
-        fsd/visualpilotdatastopped.h
-        fsd/authresponse.cpp
-        fsd/pilotdataupdate.cpp
-        fsd/ping.cpp
+        fsd/killrequest.cpp
+        fsd/killrequest.h
         fsd/messagebase.cpp
+        fsd/messagebase.h
         fsd/mute.cpp
         fsd/mute.h
-        fsd/enums.h
-        fsd/deleteatc.h
-        fsd/clientidentification.h
-        fsd/revbclientparts.h
-        fsd/deletepilot.h
-        fsd/fsdclient.h
-        fsd/flightplan.h
         fsd/pbh.h
-        fsd/killrequest.h
+        fsd/pilotdataupdate.cpp
+        fsd/pilotdataupdate.h
+        fsd/ping.cpp
+        fsd/ping.h
+        fsd/planeinforequest.cpp
         fsd/planeinforequest.h
-        fsd/addpilot.h
+        fsd/planeinforequestfsinn.cpp
+        fsd/planeinforequestfsinn.h
         fsd/planeinformation.cpp
-        fsd/clientquery.cpp
-        fsd/addpilot.cpp
-        fsd/deleteatc.cpp
-        fsd/authchallenge.cpp
         fsd/planeinformation.h
-        fsd/serializer.cpp
-        fsd/euroscopesimdata.cpp
+        fsd/planeinformationfsinn.cpp
+        fsd/planeinformationfsinn.h
+        fsd/pong.cpp
         fsd/pong.h
-        fsd/euroscopesimdata.h
-        fsd/interimpilotdataupdate.cpp
-        fsd/clientresponse.h
-        fsd/visualpilotdatatoggle.cpp
-        fsd/planeinforequestfsinn.h
-        fsd/planeinforequest.cpp
-        fsd/deletepilot.cpp
-        fsd/pilotdataupdate.h
+        fsd/rehost.cpp
+        fsd/rehost.h
+        fsd/revbclientparts.cpp
+        fsd/revbclientparts.h
+        fsd/serializer.cpp
         fsd/serializer.h
-        fsd/visualpilotdatastopped.cpp
-        fsd/fsdidentification.h
+        fsd/servererror.cpp
+        fsd/servererror.h
+        fsd/textmessage.cpp
+        fsd/textmessage.h
+        fsd/visualpilotdataperiodic.cpp
         fsd/visualpilotdataperiodic.h
+        fsd/visualpilotdatastopped.cpp
+        fsd/visualpilotdatastopped.h
+        fsd/visualpilotdatatoggle.cpp
+        fsd/visualpilotdatatoggle.h
+        fsd/visualpilotdataupdate.cpp
+        fsd/visualpilotdataupdate.h
 
         # VATSIM
         vatsim/vatsimdatafilereader.cpp
         vatsim/vatsimdatafilereader.h
         vatsim/vatsimmetarreader.cpp
         vatsim/vatsimmetarreader.h
+        vatsim/vatsimserverfilereader.cpp
+        vatsim/vatsimserverfilereader.h
         vatsim/vatsimsettings.cpp
         vatsim/vatsimsettings.h
         vatsim/vatsimstatusfilereader.cpp
         vatsim/vatsimstatusfilereader.h
-        vatsim/vatsimserverfilereader.cpp
-        vatsim/vatsimserverfilereader.h
 
         # Main
         actionbind.cpp
@@ -210,7 +210,6 @@ add_library(core SHARED
         airspacemonitor.h
         application.cpp
         application.h
-        swiftcoreexport.h
         cookiemanager.cpp
         cookiemanager.h
         corefacade.cpp
@@ -235,6 +234,7 @@ add_library(core SHARED
         setupreader.h
         simulator.cpp
         simulator.h
+        swiftcoreexport.h
         threadedreader.cpp
         threadedreader.h
         webdataservices.cpp

src/core/airspacemonitor.cpp

@@ -57,9 +57,8 @@ namespace swift::core
     CAirspaceMonitor::CAirspaceMonitor(IOwnAircraftProvider *ownAircraftProvider,
                                        IAircraftModelSetProvider *modelSetProvider, CFSDClient *fsdClient,
                                        QObject *parent)
-        : CRemoteAircraftProvider(parent), COwnAircraftAware(ownAircraftProvider),
-          CAircraftModelSetAware(modelSetProvider), m_fsdClient(fsdClient),
-          m_analyzer(new CAirspaceAnalyzer(ownAircraftProvider, m_fsdClient, this))
+        : CRemoteAircraftProvider(parent), COwnAircraftAware(ownAircraftProvider), m_modelSetProvider(modelSetProvider),
+          m_fsdClient(fsdClient), m_analyzer(new CAirspaceAnalyzer(ownAircraftProvider, m_fsdClient, this))
     {
         this->setObjectName("CAirspaceMonitor");
         this->enableReverseLookupMessages(sApp->isDeveloperFlagSet() || CBuildConfig::isLocalDeveloperDebugBuild() ?
@@ -891,7 +890,7 @@ namespace swift::core
         const QString &liveryString, const QString &modelString, CAircraftModel::ModelType type,
         CStatusMessageList *log, bool runMatchinScript)
     {
-        const int modelSetCount = this->getModelSetCount();
+        const int modelSetCount = m_modelSetProvider->getModelSetCount();
         CCallsign::addLogDetailsToList(
             log, callsign, QStringLiteral("Reverse lookup (with FP data), model set count: %1").arg(modelSetCount),
             CAirspaceMonitor::getLogCategories());
@@ -901,7 +900,7 @@ namespace swift::core
         if (hasAnyId) { this->markAsSwiftClient(callsign); }
 
         CAircraftModel lookupModel; // result
-        const CAircraftModelList modelSet = this->getModelSet();
+        const CAircraftModelList modelSet = m_modelSetProvider->getModelSet();
         const CAircraftMatcherSetup setup = m_matchingSettings.get();
         do {
             // directly check model string

src/core/airspacemonitor.h

@@ -58,8 +58,7 @@ namespace swift::core
                                                                  // CAirspaceMonitor
         public swift::misc::network::CClientProvider, // those data will be provided from the class CAirspaceMonitor
         public swift::misc::simulation::COwnAircraftAware, // used to obtain in memory information about own aircraft
-        public swift::misc::simulation::CSimulationEnvironmentAware, // elevation info etc. from simulator
-        public swift::misc::simulation::CAircraftModelSetAware // model set for reverse lookup
+        public swift::misc::simulation::CSimulationEnvironmentAware // elevation info etc. from simulator
     {
         // CRemoteAircraftProvider is QObject
         Q_OBJECT
@@ -279,6 +278,7 @@ namespace swift::core
         }; //!< settings
         QQueue<swift::misc::aviation::CCallsign> m_queryAtis; //!< query the ATIS
         QQueue<swift::misc::aviation::CCallsign> m_queryPilot; //!< query the pilot data
+        misc::simulation::IAircraftModelSetProvider *m_modelSetProvider = nullptr; //!< model set for reverse lookup
         fsd::CFSDClient *m_fsdClient = nullptr; //!< corresponding network interface
         CAirspaceAnalyzer *m_analyzer = nullptr; //!< owned analyzer
         int m_maxDistanceNM = 125; //!< position range / FSD range