From 6700f66e1cde551ad251ed98ba4d1ccc258a8e46 Mon Sep 17 00:00:00 2001
From: tzobler <tzobler@t-online.de>
Date: Wed, 5 Nov 2025 12:04:36 +0100
Subject: [PATCH] fix: Annotations from GitHub build resolved

---
 src/misc/simulation/settings/simulatorsettings.cpp          | 1 -
 .../simulator/msfs2024/simconnectsymbolsmsfs2024.cpp        | 4 ++--
 src/plugins/simulator/msfs2024/simulatormsfs2024common.cpp  | 6 ++----
 .../simulator/msfs2024/simulatormsfs2024simconnectproc.cpp  | 2 --
 src/swiftdata/main.cpp                                      | 2 +-
 src/swiftdata/swiftdataapplication.cpp                      | 2 +-
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/misc/simulation/settings/simulatorsettings.cpp b/src/misc/simulation/settings/simulatorsettings.cpp
index cc5581676..64599a592 100644
--- a/src/misc/simulation/settings/simulatorsettings.cpp
+++ b/src/misc/simulation/settings/simulatorsettings.cpp
@@ -707,7 +707,6 @@ namespace swift::misc::simulation::settings
             // msfs2024 uses no model directories but uses the field "packages directory" for filtering modelstrings
             // Asterix stands for everything == no filtering
             static const QString msfs2024 = "*";
-            if (msfs2024.isEmpty()) { return e; }
             static const QStringList md { msfs2024 };
             return md;
         }
diff --git a/src/plugins/simulator/msfs2024/simconnectsymbolsmsfs2024.cpp b/src/plugins/simulator/msfs2024/simconnectsymbolsmsfs2024.cpp
index 0396cebdb..68aaadfe0 100644
--- a/src/plugins/simulator/msfs2024/simconnectsymbolsmsfs2024.cpp
+++ b/src/plugins/simulator/msfs2024/simconnectsymbolsmsfs2024.cpp
@@ -120,7 +120,7 @@ using PfnSimConnect_AICreateSimulatedObject_EX1 = HRESULT(__stdcall *)(HANDLE, c
 
 //! The SimConnect Symbols
 //! \private
-struct SimConnectSymbols
+struct SimConnectSymbolsMsfs2024
 {
     PfnSimConnect_Open SimConnect_Open = nullptr;
     PfnSimConnect_Close SimConnect_Close = nullptr;
@@ -169,7 +169,7 @@ struct SimConnectSymbols
 #endif
 };
 
-static SimConnectSymbols gSymbols;
+static SimConnectSymbolsMsfs2024 gSymbols;
 
 template <typename FuncPtr>
 bool resolveSimConnectSymbol(QLibrary &library, FuncPtr &funcPtr, const char *funcName)
diff --git a/src/plugins/simulator/msfs2024/simulatormsfs2024common.cpp b/src/plugins/simulator/msfs2024/simulatormsfs2024common.cpp
index 33bcd7895..14d25369f 100644
--- a/src/plugins/simulator/msfs2024/simulatormsfs2024common.cpp
+++ b/src/plugins/simulator/msfs2024/simulatormsfs2024common.cpp
@@ -513,17 +513,15 @@ namespace swift::simplugin::msfs2024common
             bool incremnental = true;
             bool sortByDistributor = true;
             bool consolidateWithDb = false;
-            bool ShowAllInstalledModells = true;
+            bool ShowAllInstalledModells = true; // msfs20424 always show all installed models
 
             if (gui_application)
             {
                 givenDistributorsOnly = m_generic.getPropertyDistributorFiltered();
                 dbDataOnly = m_generic.getPropertyWithDbEntry();
-                dbIcaoOnly = false;
                 incremnental = false;
-                sortByDistributor = true;
                 consolidateWithDb = true;
-                ShowAllInstalledModells = true; // msfs20424 always show all installed models
+                ShowAllInstalledModells = true;
             }
 
             // CDistributorList distributorList;
diff --git a/src/plugins/simulator/msfs2024/simulatormsfs2024simconnectproc.cpp b/src/plugins/simulator/msfs2024/simulatormsfs2024simconnectproc.cpp
index 4517b2d03..9d6158cb2 100644
--- a/src/plugins/simulator/msfs2024/simulatormsfs2024simconnectproc.cpp
+++ b/src/plugins/simulator/msfs2024/simulatormsfs2024simconnectproc.cpp
@@ -221,8 +221,6 @@ namespace swift::simplugin::msfs2024common
             const DWORD requestId = event->dwRequestID;
             const DWORD objectId = event->dwObjectID;
 
-            const QString Test = CSimulatorMsfs2024::requestIdToString(requestId);
-
             simulatorMsfs2024->m_dispatchRequestIdLast = requestId;
 
             if (CSimulatorMsfs2024::isRequestForSimConnectObject(requestId))
diff --git a/src/swiftdata/main.cpp b/src/swiftdata/main.cpp
index 2b01ba6e2..b0ea5384a 100644
--- a/src/swiftdata/main.cpp
+++ b/src/swiftdata/main.cpp
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
         }
         CSwiftData w;
         w.show();
-        int r = a.exec();
+        r = a.exec();
     }
     return r;
 }
diff --git a/src/swiftdata/swiftdataapplication.cpp b/src/swiftdata/swiftdataapplication.cpp
index 46d52bf9e..699f12ff1 100644
--- a/src/swiftdata/swiftdataapplication.cpp
+++ b/src/swiftdata/swiftdataapplication.cpp
@@ -74,7 +74,7 @@ CStatusMessageList CSwiftDataApplication::startHookIn()
 bool CSwiftDataApplication::parsingHookIn()
 {
     // Parse core relevant arguments
-    const QString dBusAddress(this->getCmdDBusAddressValue());
+    // const QString dBusAddress(this->getCmdDBusAddressValue());
     // if (!dBusAddress.isEmpty())
     //{
     //     // check if reachable