From 55b27d8c5296efeacede77afe0741d293d1e779a Mon Sep 17 00:00:00 2001 From: Thomas Zobler Date: Wed, 17 Dec 2025 19:53:57 +0100 Subject: [PATCH] fix: change from msfs to msfs2020 --- .gitignore | 4 +-- src/gui/components/automodelsetcomponent.cpp | 7 ----- src/plugins/simulator/CMakeLists.txt | 2 +- src/plugins/simulator/msfs/CMakeLists.txt | 29 ------------------- src/plugins/simulator/msfs2020/CMakeLists.txt | 29 +++++++++++++++++++ .../simulatormsfs2020.cpp} | 2 +- .../simulatormsfs2020.h} | 0 .../simulatormsfs2020.json} | 0 .../simulatormsfs2020.json.license} | 0 .../simulatormsfsfactory2020.cpp} | 4 +-- .../simulatormsfsfactory2020.h} | 2 +- 11 files changed, 35 insertions(+), 44 deletions(-) delete mode 100644 src/plugins/simulator/msfs/CMakeLists.txt create mode 100644 src/plugins/simulator/msfs2020/CMakeLists.txt rename src/plugins/simulator/{msfs/simulatormsfs.cpp => msfs2020/simulatormsfs2020.cpp} (98%) rename src/plugins/simulator/{msfs/simulatormsfs.h => msfs2020/simulatormsfs2020.h} (100%) rename src/plugins/simulator/{msfs/simulatormsfs.json => msfs2020/simulatormsfs2020.json} (100%) rename src/plugins/simulator/{msfs/simulatormsfs.json.license => msfs2020/simulatormsfs2020.json.license} (100%) rename src/plugins/simulator/{msfs/simulatormsfsfactory.cpp => msfs2020/simulatormsfsfactory2020.cpp} (93%) rename src/plugins/simulator/{msfs/simulatormsfsfactory.h => msfs2020/simulatormsfsfactory2020.h} (96%) 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/automodelsetcomponent.cpp b/src/gui/components/automodelsetcomponent.cpp index 58913ce42..55af45203 100644 --- a/src/gui/components/automodelsetcomponent.cpp +++ b/src/gui/components/automodelsetcomponent.cpp @@ -424,13 +424,6 @@ namespace swift::gui::components CSimulatorInfo sims = this->m_enabledSimulators.get(); unsigned int number = sims.toInt(); - // iterate - // for (const auto &simInfo : number) - //{ - // m_simulator = simInfo; - // // this->createModelSet(); - //} - const int totalBits = sizeof(number) * 8; for (int i = 0; i < totalBits; ++i) { diff --git a/src/plugins/simulator/CMakeLists.txt b/src/plugins/simulator/CMakeLists.txt index 2e7a872cf..cb5b79d6d 100644 --- a/src/plugins/simulator/CMakeLists.txt +++ b/src/plugins/simulator/CMakeLists.txt @@ -36,7 +36,7 @@ if(SWIFT_BUILD_P3D_PLUGIN) endif() if(SWIFT_BUILD_MSFS2020_PLUGIN) - add_subdirectory(msfs) + add_subdirectory(msfs2020) endif() if(SWIFT_BUILD_MSFS2024_PLUGIN) diff --git a/src/plugins/simulator/msfs/CMakeLists.txt b/src/plugins/simulator/msfs/CMakeLists.txt deleted file mode 100644 index 7d45c476f..000000000 --- a/src/plugins/simulator/msfs/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -add_library(simulatormsfs SHARED - simulatormsfs.cpp - simulatormsfs.h - simulatormsfs.json - simulatormsfsfactory.cpp - simulatormsfsfactory.h -) - -set_target_properties(simulatormsfs PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/out/bin/plugins/simulator) -set_target_properties(simulatormsfs PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/out/bin/plugins/simulator) - -target_include_directories(simulatormsfs PUBLIC ${PROJECT_SOURCE_DIR}/src) - -target_link_libraries(simulatormsfs - PUBLIC - fscommon - fsxcommon - core - misc - Qt::Core -) - -install(TARGETS simulatormsfs - LIBRARY DESTINATION bin/plugins/simulator - RUNTIME DESTINATION bin/plugins/simulator - ) diff --git a/src/plugins/simulator/msfs2020/CMakeLists.txt b/src/plugins/simulator/msfs2020/CMakeLists.txt new file mode 100644 index 000000000..9630e84f2 --- /dev/null +++ b/src/plugins/simulator/msfs2020/CMakeLists.txt @@ -0,0 +1,29 @@ +# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors +# SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 + +add_library(simulatormsfs2020 SHARED + simulatormsfs2020.cpp + simulatormsfs2020.h + simulatormsfs2020.json + simulatormsfsfactory2020.cpp + simulatormsfsfactory2020.h +) + +set_target_properties(simulatormsfs2020 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/out/bin/plugins/simulator) +set_target_properties(simulatormsfs2020 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/out/bin/plugins/simulator) + +target_include_directories(simulatormsfs2020 PUBLIC ${PROJECT_SOURCE_DIR}/src) + +target_link_libraries(simulatormsfs2020 + PUBLIC + fscommon + fsxcommon + core + misc + Qt::Core +) + +install(TARGETS simulatormsfs2020 + LIBRARY DESTINATION bin/plugins/simulator + RUNTIME DESTINATION bin/plugins/simulator + ) diff --git a/src/plugins/simulator/msfs/simulatormsfs.cpp b/src/plugins/simulator/msfs2020/simulatormsfs2020.cpp similarity index 98% rename from src/plugins/simulator/msfs/simulatormsfs.cpp rename to src/plugins/simulator/msfs2020/simulatormsfs2020.cpp index 4bd3d6897..cf150e51a 100644 --- a/src/plugins/simulator/msfs/simulatormsfs.cpp +++ b/src/plugins/simulator/msfs2020/simulatormsfs2020.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: Copyright (C) 2020 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "simulatormsfs.h" +#include "simulatormsfs2020.h" #include "../fsxcommon/simconnectsymbols.h" diff --git a/src/plugins/simulator/msfs/simulatormsfs.h b/src/plugins/simulator/msfs2020/simulatormsfs2020.h similarity index 100% rename from src/plugins/simulator/msfs/simulatormsfs.h rename to src/plugins/simulator/msfs2020/simulatormsfs2020.h diff --git a/src/plugins/simulator/msfs/simulatormsfs.json b/src/plugins/simulator/msfs2020/simulatormsfs2020.json similarity index 100% rename from src/plugins/simulator/msfs/simulatormsfs.json rename to src/plugins/simulator/msfs2020/simulatormsfs2020.json diff --git a/src/plugins/simulator/msfs/simulatormsfs.json.license b/src/plugins/simulator/msfs2020/simulatormsfs2020.json.license similarity index 100% rename from src/plugins/simulator/msfs/simulatormsfs.json.license rename to src/plugins/simulator/msfs2020/simulatormsfs2020.json.license diff --git a/src/plugins/simulator/msfs/simulatormsfsfactory.cpp b/src/plugins/simulator/msfs2020/simulatormsfsfactory2020.cpp similarity index 93% rename from src/plugins/simulator/msfs/simulatormsfsfactory.cpp rename to src/plugins/simulator/msfs2020/simulatormsfsfactory2020.cpp index 39e12ca41..018cb1866 100644 --- a/src/plugins/simulator/msfs/simulatormsfsfactory.cpp +++ b/src/plugins/simulator/msfs2020/simulatormsfsfactory2020.cpp @@ -1,9 +1,9 @@ // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 -#include "simulatormsfsfactory.h" +#include "simulatormsfsfactory2020.h" -#include "simulatormsfs.h" +#include "simulatormsfs2020.h" #include "misc/simulation/simulatorplugininfo.h" diff --git a/src/plugins/simulator/msfs/simulatormsfsfactory.h b/src/plugins/simulator/msfs2020/simulatormsfsfactory2020.h similarity index 96% rename from src/plugins/simulator/msfs/simulatormsfsfactory.h rename to src/plugins/simulator/msfs2020/simulatormsfsfactory2020.h index 7202aa7a2..9619c826e 100644 --- a/src/plugins/simulator/msfs/simulatormsfsfactory.h +++ b/src/plugins/simulator/msfs2020/simulatormsfsfactory2020.h @@ -18,7 +18,7 @@ namespace swift::simplugin::msfs class CSimulatorMsFsFactory : public QObject, public swift::core::ISimulatorFactory { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.swift-project.swift_core.simulatorinterface" FILE "simulatormsfs.json") + Q_PLUGIN_METADATA(IID "org.swift-project.swift_core.simulatorinterface" FILE "simulatormsfs2020.json") Q_INTERFACES(swift::core::ISimulatorFactory) public: