From 6b953346196346ea8c6a5d0ded12deec347ee6d8 Mon Sep 17 00:00:00 2001 From: tzobler Date: Fri, 21 Nov 2025 14:48:49 +0100 Subject: [PATCH 01/10] fix: remove unnecessary code --- src/misc/simulation/msfs2024/simconnectutilities.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/misc/simulation/msfs2024/simconnectutilities.cpp b/src/misc/simulation/msfs2024/simconnectutilities.cpp index c4cc398c3..2f57cb08f 100644 --- a/src/misc/simulation/msfs2024/simconnectutilities.cpp +++ b/src/misc/simulation/msfs2024/simconnectutilities.cpp @@ -15,8 +15,6 @@ using namespace swift::misc::aviation; namespace swift::misc::simulation::msfs2024 { - CSimConnectUtilities::CSimConnectUtilities() {} - QString CSimConnectUtilities::resolveEnumToString(const DWORD id, const char *enumName) { const int i = CSimConnectUtilities::staticMetaObject.indexOfEnumerator(enumName); From cce4a8bd9766552f771bfa828133cda295f7804e Mon Sep 17 00:00:00 2001 From: Thomas Zobler Date: Sun, 30 Nov 2025 22:05:31 +0100 Subject: [PATCH 02/10] fix: src/gui/components/dbownmodelscomponent.cpp Co-authored-by: Lars Toenning --- src/gui/components/dbownmodelscomponent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/components/dbownmodelscomponent.cpp b/src/gui/components/dbownmodelscomponent.cpp index 6da6e9560..63d098793 100644 --- a/src/gui/components/dbownmodelscomponent.cpp +++ b/src/gui/components/dbownmodelscomponent.cpp @@ -282,7 +282,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(msgBox.exec()); + const auto reply = static_cast(msgBox.exec()); if (reply != QMessageBox::Yes) { return; } this->requestSimulatorModels(simulator, IAircraftModelLoader::InBackgroundNoCache); From b3fd58debbddc74bc05317527efd84ee3af18396 Mon Sep 17 00:00:00 2001 From: tzobler Date: Sun, 30 Nov 2025 22:23:28 +0100 Subject: [PATCH 03/10] fix: first changes from the pull request --- .gitignore | 4 +--- src/gui/components/dbownmodelscomponent.cpp | 5 +---- src/gui/components/logincomponent.cpp | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 04e080afc..7a94f3b6d 100644 --- a/.gitignore +++ b/.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 \ No newline at end of file diff --git a/src/gui/components/dbownmodelscomponent.cpp b/src/gui/components/dbownmodelscomponent.cpp index 63d098793..94a698b82 100644 --- a/src/gui/components/dbownmodelscomponent.cpp +++ b/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() { diff --git a/src/gui/components/logincomponent.cpp b/src/gui/components/logincomponent.cpp index d57c0350f..e5a8e6f52 100644 --- a/src/gui/components/logincomponent.cpp +++ b/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(status); + auto s = static_cast(status); if (!this->hasValidContexts()) { return; } m_simulatorConnected = s.testFlag(ISimulator::Connected); this->updateUiConnectState(); From 80e8710ecc08feebba0fce0e3530d1d06ad9b22c Mon Sep 17 00:00:00 2001 From: Thomas Zobler Date: Mon, 1 Dec 2025 07:34:03 +0100 Subject: [PATCH 04/10] fix: Update src/plugins/simulator/msfs2024/CMakeLists.txt Co-authored-by: Lars Toenning --- src/plugins/simulator/msfs2024/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/simulator/msfs2024/CMakeLists.txt b/src/plugins/simulator/msfs2024/CMakeLists.txt index 6b7145be3..373bc79f2 100644 --- a/src/plugins/simulator/msfs2024/CMakeLists.txt +++ b/src/plugins/simulator/msfs2024/CMakeLists.txt @@ -16,8 +16,8 @@ add_library(simulatormsfs2024 SHARED simconnectdatadefinitionmsfs2024.cpp simconnectdatadefinitionmsfs2024.h simulatormsfs2024simconnectproc.cpp - msfs2024export.h) - + msfs2024export.h +) set_target_properties(simulatormsfs2024 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/out/bin/plugins/simulator) set_target_properties(simulatormsfs2024 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/out/bin/plugins/simulator) From 7745830dd2236cdc576f4c4b9469241c27ae32ff Mon Sep 17 00:00:00 2001 From: Thomas Zobler Date: Mon, 1 Dec 2025 07:41:39 +0100 Subject: [PATCH 05/10] fix: Update src/misc/simulation/settings/simulatorsettings.h Co-authored-by: Lars Toenning --- src/misc/simulation/settings/simulatorsettings.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/misc/simulation/settings/simulatorsettings.h b/src/misc/simulation/settings/simulatorsettings.h index 9ef89a76a..0b38e267d 100644 --- a/src/misc/simulation/settings/simulatorsettings.h +++ b/src/misc/simulation/settings/simulatorsettings.h @@ -121,9 +121,9 @@ namespace swift::misc::simulation::settings bool setRecordedGndRadius(const swift::misc::physical_quantities::CLength &radius); //! Reads the settings for automatic loading when starting swiftgui - bool getPropertyWithDbEntry() { return m_withDbEntry; } - bool getPropertyModelSet() { return m_modelSet; } - bool getPropertyDistributorFiltered() { return m_distributorFiltered; } + bool getPropertyWithDbEntry() const { return m_withDbEntry; } + bool getPropertyModelSet() const { return m_modelSet; } + bool getPropertyDistributorFiltered() const { return m_distributorFiltered; } //! Reset the paths void resetPaths(); From 7a065fb24df87d60eb1cd4a63e70695f5849697c Mon Sep 17 00:00:00 2001 From: Thomas Zobler Date: Mon, 1 Dec 2025 07:42:58 +0100 Subject: [PATCH 06/10] fix: Update src/misc/simulation/settings/simulatorsettings.cpp Co-authored-by: Lars Toenning --- src/misc/simulation/settings/simulatorsettings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/misc/simulation/settings/simulatorsettings.cpp b/src/misc/simulation/settings/simulatorsettings.cpp index 05f242536..70fefa7b3 100644 --- a/src/misc/simulation/settings/simulatorsettings.cpp +++ b/src/misc/simulation/settings/simulatorsettings.cpp @@ -152,14 +152,14 @@ namespace swift::misc::simulation::settings } } - void CSimulatorSettings::setPropertyModelSet(bool value) { value ? m_modelSet = true : m_modelSet = false; } + void CSimulatorSettings::setPropertyModelSet(bool value) { m_modelSet = value; } void CSimulatorSettings::setPropertyWithDbEntry(bool value) { - value ? m_withDbEntry = true : m_withDbEntry = false; + m_withDbEntry = value; } void CSimulatorSettings::setPropertyDistributorFiltered(bool value) { - value ? m_distributorFiltered = true : m_distributorFiltered = false; + m_distributorFiltered = value; } void CSimulatorSettings::setPropertyByIndex(CPropertyIndexRef index, const QVariant &variant) From 65fce30c3fe9364d53f8b96eaaa1ea36465378ba Mon Sep 17 00:00:00 2001 From: Thomas Zobler Date: Mon, 1 Dec 2025 07:53:48 +0100 Subject: [PATCH 07/10] fix: Update src/misc/simulation/aircraftmodel.cpp Co-authored-by: Lars Toenning --- src/misc/simulation/aircraftmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/misc/simulation/aircraftmodel.cpp b/src/misc/simulation/aircraftmodel.cpp index 7a335aef0..9485c67ae 100644 --- a/src/misc/simulation/aircraftmodel.cpp +++ b/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; From 026711dde13aeb2a6aee7217d3e1f6811188464b Mon Sep 17 00:00:00 2001 From: Thomas Zobler Date: Mon, 1 Dec 2025 08:18:22 +0100 Subject: [PATCH 08/10] fix: Update src/swiftdata/swiftdata.h Co-authored-by: Lars Toenning --- src/swiftdata/swiftdata.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/swiftdata/swiftdata.h b/src/swiftdata/swiftdata.h index 92a9b1167..8160a4e90 100644 --- a/src/swiftdata/swiftdata.h +++ b/src/swiftdata/swiftdata.h @@ -25,7 +25,6 @@ namespace Ui namespace swift::core { class CWebDataServices; - // class CPluginManagerSimulator; } // namespace swift::core namespace swift::gui::components { From 344debc4c577f789a0471302367ccabea08afa24 Mon Sep 17 00:00:00 2001 From: Thomas Zobler Date: Mon, 1 Dec 2025 08:24:09 +0100 Subject: [PATCH 09/10] fix: Update src/core/modelsetbuilder.h Co-authored-by: Lars Toenning --- src/core/modelsetbuilder.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/modelsetbuilder.h b/src/core/modelsetbuilder.h index 31dfe0518..530047f1f 100644 --- a/src/core/modelsetbuilder.h +++ b/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) From 104f654172148fdcc80459e469c5bc25a90aec36 Mon Sep 17 00:00:00 2001 From: Thomas Zobler Date: Mon, 1 Dec 2025 08:35:31 +0100 Subject: [PATCH 10/10] fix: Update src/misc/simulation/msfs2024/aircraftmodelloadermsfs2024.cpp Co-authored-by: Lars Toenning --- src/misc/simulation/msfs2024/aircraftmodelloadermsfs2024.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/misc/simulation/msfs2024/aircraftmodelloadermsfs2024.cpp b/src/misc/simulation/msfs2024/aircraftmodelloadermsfs2024.cpp index 2e9035d88..12029f9eb 100644 --- a/src/misc/simulation/msfs2024/aircraftmodelloadermsfs2024.cpp +++ b/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)