clang format

swift-project · Nov 22, 2024 · a093aee · a093aee
1 parent 6083989
commit a093aee
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 23 deletions.
diff --git a/src/config/buildconfig.h b/src/config/buildconfig.h
@@ -30,7 +30,7 @@ namespace swift::config
         //! with MSFS support?
         static constexpr bool isCompiledWithMSFSSupport(); // defined in buildconfig_gen.inc.in
 
-       //! with MSFS2024 support?
+        //! with MSFS2024 support?
         static constexpr bool isCompiledWithMSFS2024Support(); // defined in buildconfig_gen.inc.in
 
         //! with FSUIPC support?

diff --git a/src/misc/simulation/data/modelcaches.cpp b/src/misc/simulation/data/modelcaches.cpp
@@ -311,7 +311,8 @@ namespace swift::misc::simulation::data
         case CSimulatorInfo::XPLANE: return m_modelCacheXP.set(m_modelCacheXP.get(), ts.toMSecsSinceEpoch());
         case CSimulatorInfo::FG: return m_modelCacheFG.set(m_modelCacheFG.get(), ts.toMSecsSinceEpoch());
         case CSimulatorInfo::MSFS: return m_modelCacheMsfs.set(m_modelCacheMsfs.get(), ts.toMSecsSinceEpoch());
-        case CSimulatorInfo::MSFS2024: return m_modelCacheMsfs2024.set(m_modelCacheMsfs2024.get(), ts.toMSecsSinceEpoch());
+        case CSimulatorInfo::MSFS2024:
+            return m_modelCacheMsfs2024.set(m_modelCacheMsfs2024.get(), ts.toMSecsSinceEpoch());
         default: Q_ASSERT_X(false, Q_FUNC_INFO, "Wrong simulator"); break;
         }
         return CStatusMessage();
@@ -499,7 +500,8 @@ namespace swift::misc::simulation::data
         case CSimulatorInfo::XPLANE: return m_modelCacheXP.set(m_modelCacheXP.get(), ts.toMSecsSinceEpoch());
         case CSimulatorInfo::FG: return m_modelCacheFG.set(m_modelCacheFG.get(), ts.toMSecsSinceEpoch());
         case CSimulatorInfo::MSFS: return m_modelCacheMsfs.set(m_modelCacheMsfs.get(), ts.toMSecsSinceEpoch());
-        case CSimulatorInfo::MSFS2024: return m_modelCacheMsfs2024.set(m_modelCacheMsfs2024.get(), ts.toMSecsSinceEpoch());
+        case CSimulatorInfo::MSFS2024:
+            return m_modelCacheMsfs2024.set(m_modelCacheMsfs2024.get(), ts.toMSecsSinceEpoch());
         default: Q_ASSERT_X(false, Q_FUNC_INFO, "Wrong simulator"); break;
         }
         return CStatusMessage();

diff --git a/src/misc/simulation/fscommon/fscommonutil.cpp b/src/misc/simulation/fscommon/fscommonutil.cpp
@@ -230,11 +230,9 @@ namespace swift::misc::simulation::fscommon
                                                      stopAtFailedFiles, stopped);
     }
 
-    CStatusMessageList CFsCommonUtil::validateMSFS2024SimObjectsPath(const CAircraftModelList &models,
-                                                                 CAircraftModelList &validModels,
-                                                                 CAircraftModelList &invalidModels,
-                                                                 bool ignoreEmptyFileNames, int stopAtFailedFiles,
-                                                                 std::atomic_bool &stopped, const QString &simulatorDir)
+    CStatusMessageList CFsCommonUtil::validateMSFS2024SimObjectsPath(
+        const CAircraftModelList &models, CAircraftModelList &validModels, CAircraftModelList &invalidModels,
+        bool ignoreEmptyFileNames, int stopAtFailedFiles, std::atomic_bool &stopped, const QString &simulatorDir)
     {
         Q_UNUSED(simulatorDir)
         const QStringList simObjectPaths = CFsDirectories::msfs2024SimObjectsDirPlusAddOnXmlSimObjectsPaths();

diff --git a/src/misc/simulation/fscommon/fscommonutil.h b/src/misc/simulation/fscommon/fscommonutil.h
@@ -68,13 +68,14 @@ namespace swift::misc::simulation::fscommon
                                                              bool ignoreEmptyFileNames, int stopAtFailedFiles,
                                                              std::atomic_bool &wasStopped, const QString &simulatorDir);
 
-         //! Validate if known SimObjects path are used
+        //! Validate if known SimObjects path are used
         //! \remark only for MSFS2024
         static CStatusMessageList validateMSFS2024SimObjectsPath(const CAircraftModelList &models,
-                                                             CAircraftModelList &validModels,
-                                                             CAircraftModelList &invalidModels,
-                                                             bool ignoreEmptyFileNames, int stopAtFailedFiles,
-                                                             std::atomic_bool &wasStopped, const QString &simulatorDir);
+                                                                 CAircraftModelList &validModels,
+                                                                 CAircraftModelList &invalidModels,
+                                                                 bool ignoreEmptyFileNames, int stopAtFailedFiles,
+                                                                 std::atomic_bool &wasStopped,
+                                                                 const QString &simulatorDir);
 
     private:
         //! Validate if known SimObjects path are used

diff --git a/src/misc/simulation/fscommon/fsdirectories.cpp b/src/misc/simulation/fscommon/fsdirectories.cpp
@@ -843,7 +843,7 @@ namespace swift::misc::simulation::fscommon
         QSet<QString> paths;
         for (const QString &msfs2024File : msfs2024Files)
         {
-          //  paths.unite(CFsDirectories::msfs2024SimObjectsPaths(msfs2024File, checked));
+            //  paths.unite(CFsDirectories::msfs2024SimObjectsPaths(msfs2024File, checked));
         }
         return paths;
     }

diff --git a/src/plugins/simulator/msfs2024/simulatormsfs2024.cpp b/src/plugins/simulator/msfs2024/simulatormsfs2024.cpp
@@ -18,8 +18,8 @@ using namespace swift::simplugin::fsxcommon;
 namespace swift::simplugin::msfs2024
 {
     CSimulatorMsFs2024::CSimulatorMsFs2024(const CSimulatorPluginInfo &info, IOwnAircraftProvider *ownAircraftProvider,
-                                   IRemoteAircraftProvider *remoteAircraftProvider, IClientProvider *clientProvider,
-                                   QObject *parent)
+                                           IRemoteAircraftProvider *remoteAircraftProvider,
+                                           IClientProvider *clientProvider, QObject *parent)
         : CSimulatorFsxCommon(info, ownAircraftProvider, remoteAircraftProvider, clientProvider, parent)
     {
         this->setDefaultModel({ "Airbus A320 Neo Asobo", CAircraftModel::TypeModelMatchingDefaultModel,
@@ -33,7 +33,7 @@ namespace swift::simplugin::msfs2024
     }
 
     void CSimulatorMsFs2024::setTrueAltitude(CAircraftSituation &aircraftSituation,
-                                         const DataDefinitionOwnAircraft &simulatorOwnAircraft)
+                                             const DataDefinitionOwnAircraft &simulatorOwnAircraft)
     {
         aircraftSituation.setAltitude(
             CAltitude(simulatorOwnAircraft.altitudeCalibratedFt, CAltitude::MeanSeaLevel, CLengthUnit::ft()));

diff --git a/src/plugins/simulator/msfs2024/simulatormsfs2024.h b/src/plugins/simulator/msfs2024/simulatormsfs2024.h
@@ -18,9 +18,9 @@ namespace swift::simplugin::msfs2024
     public:
         //! Constructor, parameters as in \sa swift::core::ISimulatorFactory::create
         CSimulatorMsFs2024(const swift::misc::simulation::CSimulatorPluginInfo &info,
-                       swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
-                       swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
-                       swift::misc::network::IClientProvider *clientProvider, QObject *parent = nullptr);
+                           swift::misc::simulation::IOwnAircraftProvider *ownAircraftProvider,
+                           swift::misc::simulation::IRemoteAircraftProvider *remoteAircraftProvider,
+                           swift::misc::network::IClientProvider *clientProvider, QObject *parent = nullptr);
 
         //! \name ISimulator implementations
         //! @{

diff --git a/src/plugins/simulator/msfs2024/simulatormsfs2024factory.cpp b/src/plugins/simulator/msfs2024/simulatormsfs2024factory.cpp
@@ -14,9 +14,9 @@ using namespace swift::core;
 namespace swift::simplugin::msfs2024
 {
     ISimulator *CSimulatorMsFs2024Factory::create(const CSimulatorPluginInfo &info,
-                                              IOwnAircraftProvider *ownAircraftProvider,
-                                              IRemoteAircraftProvider *remoteAircraftProvider,
-                                              IClientProvider *clientProvider)
+                                                  IOwnAircraftProvider *ownAircraftProvider,
+                                                  IRemoteAircraftProvider *remoteAircraftProvider,
+                                                  IClientProvider *clientProvider)
     {
         Q_ASSERT(ownAircraftProvider);
         return new CSimulatorMsFs2024(info, ownAircraftProvider, remoteAircraftProvider, clientProvider, this);