fix: change from msfs to msfs2020

.gitignore

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

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)
         {

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)

src/plugins/simulator/msfs/CMakeLists.txt

@@ -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
-        )

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
+        )

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"
 

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"
 

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: