refactor: Remove unnecessary comments

tzobler · tzobler · commit e0ff0df56a6f · 2025-11-04T09:01:49.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,7 +22,8 @@ env:
   bitrock_version: qt-professional-24.7.0
   bitrock_url:     https://releases.installbuilder.com/installbuilder
   externals: swift-project/externals
-  externals_sha: 5787843a7acc6e4236ab5fe9182b18082469bbd9
+  externals_sha: e1f1743ba159e11b0c065ea8f1ae1a0e91e3bf39
+                 
   
   use_externals: ${{ secrets.EXTERNALS_PAT != '' }}
 
diff --git a/src/gui/components/dbownmodelscomponent.cpp b/src/gui/components/dbownmodelscomponent.cpp
@@ -339,6 +339,9 @@ namespace swift::gui::components
                                                               IAircraftModelLoader::LoadMode mode,
                                                               const QStringList &modelDirectories)
     {
+        Q_UNUSED(mode);
+        Q_UNUSED(modelDirectories);
+
         using namespace std::chrono_literals;
         const CStatusMessage msg = CLogMessage(this).info(u"Start loading models for %1") << simulator.toQString();
         this->showOverlayHTMLMessage(msg, 2s);
@@ -528,8 +531,7 @@ namespace swift::gui::components
                                                        IAircraftModelLoader::LoadMode mode,
                                                        const QStringList &modelDirectories)
     {
-        // TODO TZ check
-        // At this point, we switch how the models should be loaded: SimConnect or file search.
+        // At this point, we switch how the models should be loaded: SimConnect or classic file search
         if (simulator.isMSFS2024())
             this->loadInstalledModelsSimConnect(simulator, mode, modelDirectories);
         else
diff --git a/src/misc/simulation/msfs2024/aircraftmodelloadermsfs2024.cpp b/src/misc/simulation/msfs2024/aircraftmodelloadermsfs2024.cpp
@@ -56,10 +56,8 @@ namespace swift::misc::simulation::msfs2024
     {
         CAircraftModelList allModels;
 
-        // TODO TZ implement model querying via SimConnect
-        // at this point, we trigger SimConnect to query the model list
-        // HRESULT hr = S_OK();
-        // hr = CSimConnectDefinitions::initOwnAircraftList(CSimulatorMsfs2024::getSimConnectHandle());
+        // TODO TZ Implement model queries via SimConnect if possible
+        // misc shut not include simconnect headers or plugins directly
 
         const CSimulatorInfo simulatorInfo = CSimulatorInfo::msfs2024();
         allModels =
diff --git a/src/misc/simulation/settings/simulatorsettings.cpp b/src/misc/simulation/settings/simulatorsettings.cpp
@@ -704,10 +704,9 @@ namespace swift::misc::simulation::settings
         }
         case CSimulatorInfo::MSFS2024:
         {
-            // TODO TZ check
             // msfs2024 uses no model directories but uses the field "packages directory" for filtering modelstrings
+            // Asterix stands for everything == no filtering
             static const QString msfs2024 = "*";
-            // CFileUtils::normalizeFilePathToQtStandard(CFsDirectories::msfs2024PackagesDir());
             if (msfs2024.isEmpty()) { return e; }
             static const QStringList md { msfs2024 };
             return md;
diff --git a/src/misc/simulation/simulatedaircraft.h b/src/misc/simulation/simulatedaircraft.h
@@ -412,6 +412,9 @@ namespace swift::misc
             //! Get model Livery MSFS2024
             const QString &getLiveryString() const { return m_models[CurrentModel].getModelLivery(); }
 
+            //! Get short model string (without livery)
+            const QString getShortModelString() const { return m_models[CurrentModel].getShortModelString(); }
+
             //! Set model string
             void setModelString(const QString &modelString);
 
diff --git a/src/plugins/simulator/msfs2024/simconnectdatadefinitionmsfs2024.cpp b/src/plugins/simulator/msfs2024/simconnectdatadefinitionmsfs2024.cpp
@@ -76,6 +76,8 @@ namespace swift::simplugin::msfs2024common
     HRESULT CSimConnectDefinitions::initDataDefinitionsWhenConnected(const HANDLE hSimConnect,
                                                                      const CSimulatorInfo &simInfo)
     {
+        Q_UNUSED(simInfo);
+
         HRESULT hr = s_ok();
         hr += initOwnAircraft(hSimConnect);
         hr += initRemoteAircraft(hSimConnect);
diff --git a/src/plugins/simulator/msfs2024/simulatormsfs2024common.cpp b/src/plugins/simulator/msfs2024/simulatormsfs2024common.cpp
@@ -390,7 +390,7 @@ namespace swift::simplugin::msfs2024common
             sSimmobjectLoadedState.bLoadStarted = true;
             CLogMessage(this).info(u"Start loading SimObjects and liverys from simulator");
 
-            // TODO TZ a message should be displayed here because the gui freezes during loading
+            // TODO TZ a message should be displayed here because the gui freezes during loading large amounts of data
             const CStatusMessage m = CStatusMessage(this, CStatusMessage::SeverityInfo,
                                                     u"Start loading SimObjects and liverys from simulator");
         }
@@ -411,24 +411,25 @@ namespace swift::simplugin::msfs2024common
         default: break;
         }
 
-        // if (sSimmobjectLoadedState.bAirplaneLoaded && sSimmobjectLoadedState.bHelicopterLoaded &&
-        //     sSimmobjectLoadedState.bHotAirLoaded)
-        //{
+        // sSimmobjectLoadedState.bHotAirLoaded
         if (sSimmobjectLoadedState.bAirplaneLoaded && sSimmobjectLoadedState.bHelicopterLoaded)
         {
             sSimmobjectLoadedState.bLoadStarted = false;
             size_t countmodels = vSimObjectsAndLiveries.size();
             CLogMessage(this).info(u"%1 SimObjects and Liveries loaded from SimConnect") << countmodels;
 
             // now we try to create a new temporary model list
-            createNewModelList();
+            setSimObjectAndLiveries();
 
             CLogMessage(this).info(u"finished new model set");
         }
     }
 
     void CSimulatorMsfs2024::setSimObjectAndLiveries()
     {
+        // TODO TZ a message should be displayed here because the gui freezes during loading
+        // better: move to the background (e.g., use CWorker::fromTask(...)), avoid GUI freeze.
+
         CLogMessage(this).info(u"%1 SimObjects and Liveries in vSimObjectsAndLiveries")
             << vSimObjectsAndLiveries.size();
         // owner = this (QObject in main thread)
@@ -441,11 +442,8 @@ namespace swift::simplugin::msfs2024common
         worker->then(this, [=] { CLogMessage(this).info(u"SimObjects and Liveries in vSimObjectsAndLiveries ready"); });
     }
 
-    // TODO TZ under construction
     void CSimulatorMsfs2024::createNewModelList()
     {
-        // TODO TZ a message should be displayed here because the gui freezes during loading
-        // better: move to the background (e.g., use CWorker::fromTask(...)), avoid GUI freeze.
 
         const CSpecializedSimulatorSettings settings = this->getSimulatorSettings();
         CSimulatorSettings m_generic = settings.getGenericSettings();
@@ -456,8 +454,6 @@ namespace swift::simplugin::msfs2024common
         if (guiName.contains("mapping")) gui_application = false;
 
         CAircraftModelList newModels;
-        // CAircraftModelList validModels;
-        // CAircraftModelList invalidModels;
 
         for (int i = 0; i < static_cast<int>(vSimObjectsAndLiveries.size()); ++i)
         {
@@ -477,9 +473,6 @@ namespace swift::simplugin::msfs2024common
             model.setModelType(CAircraftModel::TypeOwnSimulatorModel);
             model.setSimulator(this->getSimulatorInfo());
 
-            // if (gui_application)
-            //{
-            //  filter certain models if needed with settings from settingssimulatormsfs2024.json
             bool excluded = false;
             for (const QString &rawPattern : excludePatterns)
             {
@@ -492,11 +485,8 @@ namespace swift::simplugin::msfs2024common
                 }
             }
             if (excluded) continue; // skip adding this model
-            //}
-            newModels.replaceOrAddModelWithString(model, Qt::CaseInsensitive);
 
-            // TODO TZ do we need valid/invalid models here? I think not
-            // newModels.addAsValidOrInvalidModel(model, true, validModels, invalidModels);
+            newModels.replaceOrAddModelWithString(model, Qt::CaseInsensitive);
         }
 
         CAircraftModelList newModelList;
@@ -520,25 +510,16 @@ namespace swift::simplugin::msfs2024common
             bool sortByDistributor = true;
             bool consolidateWithDb = false;
             bool ShowAllInstalledModells = true;
-            // const CAircraftModelList models = this->getMappingComponent()->getOwnModels();
-            // const CDistributorList distributors = ui->form_OwnModelSet->getDistributorsBasedOnOptions();
-            // const QStringList distributorNames = { "ASOBO", "FSLTL", "CARENADO", "FS9", "PMDG", "FBW", "AIG" };
-            // const QStringList distributorNames = { "ASOBO" };
 
             if (gui_application)
             {
                 givenDistributorsOnly = m_generic.getPropertyDistributorFiltered();
                 dbDataOnly = m_generic.getPropertyWithDbEntry();
-                // optionDbIcaoCodesOnly
                 dbIcaoOnly = false;
-                // optionIncrementalBuild
                 incremnental = false;
-                // optionSortByDistributorPreferences
                 sortByDistributor = true;
-                // optionConsolidateModelSetWithDbData
                 consolidateWithDb = true;
-
-                ShowAllInstalledModells = true;
+                ShowAllInstalledModells = true; // msfs20424 always show all installed models
             }
 
             // CDistributorList distributorList;
@@ -555,16 +536,12 @@ namespace swift::simplugin::msfs2024common
             if (consolidateWithDb) { options |= CModelSetBuilder::ConsolidateWithDb; }
             if (ShowAllInstalledModells) { options |= CModelSetBuilder::ShowAllInstalledModells; }
             const CSimulatorInfo &simulator = this->getSimulatorInfo();
-            // return
 
             CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().synchronizeCache(simulator);
-            // for swiftgui it is enough to set the cache here
-
             currentSet = CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().getCachedModels(simulator);
 
             NewSet = builder.buildModelSet(simulator, newModelList, currentSet, options, distributorList);
 
-            // TODO TZ cache the new model set for further usage
             CAircraftMatcher matcher;
             swift::misc::simulation::CAircraftMatcherSetup mSetup = matcher.getSetup();
 
@@ -576,21 +553,13 @@ namespace swift::simplugin::msfs2024common
                                    NewSet.latestTimestamp();
             if (!latestDbModelsTs.isValid()) { return; }
 
+            // for swiftgui it is enough to set the cache here
             if (gui_application)
-            {
-                // for swiftgui it is enough to set the cache here
                 CCentralMultiSimulatorModelSetCachesProvider::modelCachesInstance().setCachedModels(NewSet, simulator);
-                CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().setModelsForSimulator(NewSet,
-                                                                                                       simulator);
-            }
-            else
-            {
-                // for swiftdata we set the installed model here
-                CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().setModelsForSimulator(NewSet,
-                                                                                                       simulator);
-            }
+
             CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().updateModelsForSimulator(NewSet,
                                                                                                       simulator);
+
             // CCentralMultiSimulatorModelCachesProvider::modelCachesInstance().getSynchronizedCachedModels(simulator);
 
             const CStatusMessage m = CStatusMessage(this, CStatusMessage::SeverityInfo,
@@ -600,7 +569,6 @@ namespace swift::simplugin::msfs2024common
 
             // TODO TZ only for debugging
             // int cstoremodels = writeSimObjectsAndLiveriesToFile(NewSet);
-            // CLogMessage(this).info(u"%1 SimObjects and Liveries stored to aircraftlist.txt") << cstoremodels;
         }
     }
 
@@ -613,28 +581,12 @@ namespace swift::simplugin::msfs2024common
         if (!datei) return 0;
         for (int i = 0; i < static_cast<int>(Modelset.size()); ++i)
         {
-            datei << Modelset[i].getModelString().toStdString() << "::" << Modelset[i].getModelLivery().toStdString()
-                  << "::" << Modelset[i].getDbKey() << std::endl;
+            datei << Modelset[i].getShortModelString().toStdString()
+                  << "::" << Modelset[i].getModelLivery().toStdString() << "::" << Modelset[i].getDbKey() << std::endl;
             ++counter;
         }
         datei.close();
         return counter;
-
-        //// datei << element.AircraftTitle // PMDG DC-6A PMDG House (N6PA | 2021)
-        ////       << "::" << element.LiveryName // ''
-        ////       << "::" << model.getName().toStdString() // DC-6A_v1
-        ////       << "::" << model.getAircraftIcaoCode().getDbKeyAsString().toStdString() // 3198
-        ////       << "::" << model.getDbKey() // 53714
-        ////       << "::"
-        ////       << model.getAirlineIcaoCode().getDbKeyAsString().toStdString() // 6809
-        ////       //<< "::" << model.getAirlineIcaoCode().toStdString()
-        ////       << "::" << model.getDescription().toStdString() // Douglas DC-6A PMDG House (N6PA | 2021)
-        ////       << "::" << model.getDistributor().getDbKeyAsJsonValue().toString().toStdString() // PMDG
-        ////       << "::" << model.getSimulator().toStdString() // FSX P3D MSFS MSFS2024
-        ////       << "::" << model.getAircraftIcaoCode().toStdString() // DC6 (3198) L4P M
-        ////       << "::" << model.getModelStringAndDbKey().toStdString() // PMDG DC-6A PMDG HOUSE (N6PA | 2021)
-        ////       (53714)
-        ////      << std::endl;
     }
 
     bool CSimulatorMsfs2024::isTracingSendId() const
@@ -2043,23 +1995,9 @@ namespace swift::simplugin::msfs2024common
         const SIMCONNECT_DATA_INITPOSITION initialPosition =
             CSimulatorMsfs2024::aircraftSituationToFsxPosition(initialSituation, sendGround, true, &underflowStatus);
 
-        QString modelString(newRemoteAircraft.getModelString());
+        QString modelString(newRemoteAircraft.getShortModelString());
         const QString modelLiveryString(newRemoteAircraft.getLiveryString());
 
-        // For msfs2024, the model and livery must be passed separately. The livery string is already linked to the
-        // model string in the database to maintain compatibility with other simulators.. Therefore, we need to separate
-        // it here.
-        if (modelString.contains(modelLiveryString))
-        {
-            int lastIndex = modelString.lastIndexOf(modelLiveryString);
-
-            if (lastIndex != -1)
-            {
-                const QString newModelString = modelString.left(lastIndex);
-                modelString = newModelString;
-            }
-        }
-
         if (this->showDebugLogMessage())
         {
             this->debugLogMessage(Q_FUNC_INFO,
@@ -2076,20 +2014,12 @@ namespace swift::simplugin::msfs2024common
         CSimConnectObject::SimObjectType type = CSimConnectObject::AircraftNonAtc;
         HRESULT hr = S_OK;
 
-        // TODO TZ DEBUG the index 10 is just for testing liveries
-        // sSimObjectLivery &simObjectToSpawn = vSimObjectsAndLiveries[1];
-        // simObjectToSpawn.szSimObjectTitle = "A320neo V2";
-        // simObjectToSpawn.szLiveryName = "";
-
         if (probe)
         {
-            hr = SimConnect_AICreateNonATCAircraft_EX1(
-                m_hSimConnect, modelStringBa.constData(), // simObjectToSpawn.szSimObjectTitle.c_str(),
-                modelLiveryBa.constData(), csBa.constData(), initialPosition, requestId);
+            hr = SimConnect_AICreateNonATCAircraft_EX1(m_hSimConnect, modelStringBa.constData(),
+                                                       modelLiveryBa.constData(), csBa.constData(), initialPosition,
+                                                       requestId);
 
-            // TODO TZ remove later
-            // hr = SimConnect_AICreateSimulatedObject(m_hSimConnect, modelStringBa.constData(), initialPosition,
-            // requestId);
             type = CSimConnectObject::TerrainProbe;
         }
         else
@@ -2102,14 +2032,9 @@ namespace swift::simplugin::msfs2024common
                     u"Model '%1' for '%2' failed %1 time(s) before, using AICreateSimulatedObject now")
                     << newRemoteAircraft.getModelString() << callsign.toQString();
 
-                hr = SimConnect_AICreateNonATCAircraft_EX1(
-                    m_hSimConnect,
-                    modelStringBa.constData(), // simObjectToSpawn.szSimObjectTitle.c_str(),
-                    modelLiveryBa.constData(), csBa.constData(), initialPosition, requestId);
-
-                // TODO TZ remove later
-                // hr = SimConnect_AICreateSimulatedObject(m_hSimConnect, modelStringBa.constData(), initialPosition,
-                //                                         requestId);
+                hr = SimConnect_AICreateNonATCAircraft_EX1(m_hSimConnect, modelStringBa.constData(),
+                                                           modelLiveryBa.constData(), csBa.constData(), initialPosition,
+                                                           requestId);
 
                 type = CSimConnectObject::AircraftSimulatedObject;
             }
@@ -2118,9 +2043,7 @@ namespace swift::simplugin::msfs2024common
                 hr = SimConnect_AICreateNonATCAircraft_EX1(m_hSimConnect, modelStringBa.constData(),
                                                            modelLiveryBa.constData(), csBa.constData(), initialPosition,
                                                            requestId);
-                // TODO TZ remove later
-                // hr = SimConnect_AICreateNonATCAircraft(m_hSimConnect, modelStringBa.constData(), csBa.constData(),
-                // initialPosition, requestId);
+
                 type = CSimConnectObject::AircraftNonAtc;
             }
         }
@@ -2522,7 +2445,7 @@ namespace swift::simplugin::msfs2024common
         return ok;
     }
 
-    // TODO TZ DEBUG only
+    // TODO TZ under investigation, flaps retracting to 0 again and other issues
     bool CSimulatorMsfs2024::sendRemoteAircraftPartsToSimulator(const CSimConnectObject &simObject,
                                                                 const CAircraftParts &parts)
     {
diff --git a/src/swiftdata/swiftdata.h b/src/swiftdata/swiftdata.h
@@ -10,11 +10,6 @@
 #include <QObject>
 #include <QScopedPointer>
 
-// TODO TZ
-// #include "core/pluginmanagersimulator.h"
-// #include "misc/simulation/simulatorplugininfo.h"
-// #include "misc/simulation/simulatorplugininfolist.h"
-
 #include "core/db/backgrounddataupdater.h"
 #include "gui/mainwindowaccess.h"
 #include "gui/managedstatusbar.h"
@@ -87,13 +82,6 @@ class CSwiftData : public QMainWindow, public swift::misc::CIdentifiable, public
     void displayLog();
     void checkMinimumVersion();
 
-    // TODO TZ
-    // swift::core::CPluginManagerSimulator *m_plugins = nullptr;
-
-    //! Available plugins, auto pseudo plugin added
-    // static swift::misc::simulation::CSimulatorPluginInfoList getAvailablePlugins();
-    //  END TODO TZ
-
     QScopedPointer<Ui::CSwiftData> ui;
     swift::gui::CManagedStatusBar m_statusBar;
     swift::core::db::CBackgroundDataUpdater *m_updater = nullptr; //!< consolidate with DB data

Original file line number	Diff line number	Diff line change
`@@ -704,10 +704,9 @@ namespace swift::misc::simulation::settings`
`704`	`704`	`}`
`705`	`705`	`case CSimulatorInfo::MSFS2024:`
`706`	`706`	`{`
`707`		`- // TODO TZ check`
`708`	`707`	`// msfs2024 uses no model directories but uses the field "packages directory" for filtering modelstrings`
	`708`	`+ // Asterix stands for everything == no filtering`
`709`	`709`	`static const QString msfs2024 = "*";`
`710`		`- // CFileUtils::normalizeFilePathToQtStandard(CFsDirectories::msfs2024PackagesDir());`
`711`	`710`	`if (msfs2024.isEmpty()) { return e; }`
`712`	`711`	`static const QStringList md { msfs2024 };`
`713`	`712`	`return md;`
Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,8 @@ namespace swift::simplugin::msfs2024common`
`76`	`76`	`HRESULT CSimConnectDefinitions::initDataDefinitionsWhenConnected(const HANDLE hSimConnect,`
`77`	`77`	`const CSimulatorInfo &simInfo)`
`78`	`78`	`{`
	`79`	`+ Q_UNUSED(simInfo);`
	`80`	`+`
`79`	`81`	`HRESULT hr = s_ok();`
`80`	`82`	`hr += initOwnAircraft(hSimConnect);`
`81`	`83`	`hr += initRemoteAircraft(hSimConnect);`