fix: Fix errors from pull request

Co-authored-by: Lars Toenning <dev@ltoenning.de>

Author: tzobler

.gitignore

@@ -51,6 +51,4 @@ cmake-build-*/
 /out/
 /dist/
 CMakeUserPresets.json
-/third_party/externals
-/src/plugins/simulator/msfs2024/simulatormsfs2024.cpp_
-/src/plugins/simulator/msfs2024/simulatormsfs2024.h_
+/third_party/externals

src/core/airspacemonitor.cpp

@@ -787,10 +787,6 @@ namespace swift::core
         }
     }
 
-    // for request
-    // #SBBER750:DAL483:FSIPIR:0:BER:A320:::::L2J:PMDG 737-800 AIRBERLIN (D-ABKM)
-    // and also for information
-    // #SBFSC751 : BER636 : FSIPI : 0 ::EC35:: :: : H2T : AIRBUS H135 NORSK LUFTAMBULANSE
     void CAirspaceMonitor::onCustomFSInnPacketReceived(const CCallsign &callsign, const QString &airlineIcaoDesignator,
                                                        const QString &aircraftIcaoDesignator,
                                                        const QString &combinedAircraftType, const QString &modelString)
@@ -865,16 +861,15 @@ namespace swift::core
             // in order not to override swift livery string data, we ignore those
             if (!usedModelString.isEmpty())
             {
-                const CSimulatedAircraft aircraft = this->addOrUpdateAircraftInRange(
-                    callsign, aircraftIcaoDesignator, airlineIcaoDesignator, QString(), usedModelString,
-                    CAircraftModel::TypeFSInnData, pReverseLookupMessages);
+                this->addOrUpdateAircraftInRange(callsign, aircraftIcaoDesignator, airlineIcaoDesignator, QString(),
+                                                 usedModelString, CAircraftModel::TypeFSInnData,
+                                                 pReverseLookupMessages);
                 this->addReverseLookupMessages(callsign, reverseLookupMessages);
             }
             this->sendReadyForModelMatching(callsign, ReceivedFsInnPacket); // from FSInn
         }
     }
 
-    // #SBDAL483:BER636:PI:GEN:EQUIPMENT=B738:AIRLINE=DAL:LIVERY=swift_l1855a1787m13853
     void CAirspaceMonitor::onIcaoCodesReceived(const CCallsign &callsign, const QString &aircraftIcaoDesignator,
                                                const QString &airlineIcaoDesignator, const QString &livery)
     {
@@ -1227,14 +1222,6 @@ namespace swift::core
             // we do not change manually assigned models (msfs2024)
             if (!aircraft.getModel().hasValidDbKey() && aircraft.getModelType() != CAircraftModel::TypeManuallySet)
             {
-
-                CLogMessage(this).warning(u"CAirspaceMonitor::reverseLookupModelWithFlightplanData "
-                                          u"aircraft.getModelType %1 "
-                                          u"callsign %2 "
-                                          u"aircraftIcao %3 "
-                                          u"incomming modelType %4 ")
-                    << aircraft.getModelType() << callsign.toQString() << aircraftIcao << modelType;
-
                 CAircraftModel model = this->reverseLookupModelWithFlightplanData(callsign, aircraftIcao, airlineIcao,
                                                                                   livery, modelString, modelType, log);
                 model.updateMissingParts(aircraft.getModel());

src/core/modelsetbuilder.cpp

@@ -49,7 +49,7 @@ namespace swift::core
         }
         else
         {
-            if (!options.testFlag(ShowAllInstalledModells))
+            if (!options.testFlag(ShowAllInstalledModels))
                 // without any information we can not use them
                 modelSet = modelSet.findWithKnownAircraftDesignator();
         }

src/core/modelsetbuilder.h

@@ -35,7 +35,7 @@ namespace swift::core
             Incremental = 1 << 3,
             SortByDistributors = 1 << 4,
             ConsolidateWithDb = 1 << 5,
-            ShowAllInstalledModells = 1 << 6,
+            ShowAllInstalledModels = 1 << 6,
         };
         Q_DECLARE_FLAGS(Builder, BuilderFlag)
 

src/gui/components/dbownmodelscomponent.cpp

@@ -97,10 +97,7 @@ namespace swift::gui::components
         ui->tvp_OwnAircraftModels->setCustomMenu(new CConsolidateWithDbDataMenu(ui->tvp_OwnAircraftModels, this));
     }
 
-    CDbOwnModelsComponent::~CDbOwnModelsComponent()
-    {
-        // void
-    }
+    CDbOwnModelsComponent::~CDbOwnModelsComponent() = default;
 
     const QStringList &CDbOwnModelsComponent::getLogCategories()
     {
@@ -282,7 +279,7 @@ namespace swift::gui::components
                            QStringLiteral("Completely reload '%1' models from disk?").arg(simulator.toQString(true)),
                            QMessageBox::Yes | QMessageBox::No, this);
         msgBox.setDefaultButton(QMessageBox::Cancel);
-        const QMessageBox::StandardButton reply = static_cast<QMessageBox::StandardButton>(msgBox.exec());
+        const auto reply = static_cast<QMessageBox::StandardButton>(msgBox.exec());
         if (reply != QMessageBox::Yes) { return; }
 
         this->requestSimulatorModels(simulator, IAircraftModelLoader::InBackgroundNoCache);
@@ -513,7 +510,7 @@ namespace swift::gui::components
             "override the loaded models from the simulator.\nNormally you would not want that (cancel).",
             QMessageBox::Save | QMessageBox::Cancel, this);
         msgBox.setDefaultButton(QMessageBox::Cancel);
-        const QMessageBox::StandardButton reply = static_cast<QMessageBox::StandardButton>(msgBox.exec());
+        const auto reply = static_cast<QMessageBox::StandardButton>(msgBox.exec());
         if (reply != QMessageBox::Cancel) { return; }
         const CAircraftModelList models = ui->tvp_OwnAircraftModels->container();
         if (models.isEmpty()) { return; }

src/gui/components/logincomponent.cpp

@@ -136,7 +136,7 @@ namespace swift::gui::components
         });
     }
 
-    CLoginComponent::~CLoginComponent() {}
+    CLoginComponent::~CLoginComponent() = default;
 
     void CLoginComponent::mainInfoAreaChanged(const QWidget *currentWidget)
     {
@@ -313,7 +313,7 @@ namespace swift::gui::components
 
     void CLoginComponent::onSimulatorStatusChanged(int status)
     {
-        ISimulator::SimulatorStatus s = static_cast<ISimulator::SimulatorStatus>(status);
+        auto s = static_cast<ISimulator::SimulatorStatus>(status);
         if (!this->hasValidContexts()) { return; }
         m_simulatorConnected = s.testFlag(ISimulator::Connected);
         this->updateUiConnectState();

src/misc/CMakeLists.txt

@@ -682,7 +682,7 @@ add_library(misc SHARED
         weather/windlayer.h
         weather/windlayerlist.cpp
         weather/windlayerlist.h
-        )
+)
 
 if(APPLE)
     target_sources(misc PRIVATE

src/misc/simulation/aircraftmodel.cpp

@@ -245,7 +245,7 @@ namespace swift::misc::simulation
         return this->getAllModelStringsAndAliases() % " " % this->getDbKeyAsStringInParentheses();
     }
 
-    QString CAircraftModel::getMsfs2024Modelstring()
+    QString CAircraftModel::getMsfs2024ModelString()
     {
         m_modelString = m_modelString.trimmed().toUpper() % u" " % m_modelLivery.trimmed().toUpper();
         return m_modelString;

src/misc/simulation/aircraftmodel.h

@@ -211,7 +211,7 @@ namespace swift::misc
             QString getAllModelStringsAliasesAndDbKey() const;
 
             //! Get model string and Livery
-            QString getMsfs2024Modelstring();
+            QString getMsfs2024ModelString();
 
             //! Model string alias
             void setModelStringAlias(const QString &alias) { m_modelStringAlias = alias.trimmed().toUpper(); }

src/misc/simulation/msfs2024/aircraftmodelloadermsfs2024.cpp

@@ -29,7 +29,7 @@ namespace swift::misc::simulation::msfs2024
     bool CAircraftModelLoaderMsfs2024::isLoadingFinished() const
     {
         return !m_parserWorker || m_parserWorker->isFinished();
-        ;
+     
     }
 
     CAircraftModelLoaderMsfs2024::CAircraftModelLoaderMsfs2024(QObject *parent)