refactor: clang-format

src/plugins/simulator/fsxcommon/fsxsettingscomponent.cpp

@@ -2,16 +2,18 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "fsxsettingscomponent.h"
-#include "ui_fsxsettingscomponent.h"
-#include "simulatorfsxcommon.h"
-#include "gui/overlaymessagesframe.h"
-#include "gui/guiapplication.h"
-#include "core/context/contextsimulator.h"
-#include "config/buildconfig.h"
 
 #include <QPointer>
 #include <QTimer>
 
+#include "simulatorfsxcommon.h"
+#include "ui_fsxsettingscomponent.h"
+
+#include "config/buildconfig.h"
+#include "core/context/contextsimulator.h"
+#include "gui/guiapplication.h"
+#include "gui/overlaymessagesframe.h"
+
 using namespace swift::core;
 using namespace swift::core::context;
 using namespace swift::gui;
@@ -131,4 +133,4 @@ namespace swift::simplugin::fsxcommon
         CSimulatorFsxCommon *fsx = static_cast<CSimulatorFsxCommon *>(simulator);
         return fsx;
     }
-} // ns
+} // namespace swift::simplugin::fsxcommon

src/plugins/simulator/fsxcommon/fsxsettingscomponent.h

@@ -6,12 +6,13 @@
 #ifndef SWIFT_SIMPLUGIN_FSXCOMMON_FSXSETTINGSCOMPONENT_H
 #define SWIFT_SIMPLUGIN_FSXCOMMON_FSXSETTINGSCOMPONENT_H
 
-#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
-#include "misc/simulation/simulatorinfo.h"
-#include "misc/simulation/simulatorplugininfo.h"
 #include <QFrame>
 #include <QScopedPointer>
 
+#include "misc/simulation/simulatorinfo.h"
+#include "misc/simulation/simulatorplugininfo.h"
+#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
+
 namespace Ui
 {
     class CFsxSettingsComponent;
@@ -71,6 +72,6 @@ namespace swift::simplugin::fsxcommon
         swift::gui::COverlayMessagesFrame *m_mf = nullptr;
         QScopedPointer<Ui::CFsxSettingsComponent> ui;
     };
-} // ns
+} // namespace swift::simplugin::fsxcommon
 
 #endif // guard

src/plugins/simulator/fsxcommon/simconnectdatadefinition.cpp

@@ -2,14 +2,17 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "simconnectdatadefinition.h"
-#include "simconnectsymbols.h"
-#include "../fscommon/simulatorfscommonfunctions.h"
-#include "misc/aviation/aircraftparts.h"
-#include "misc/aviation/aircraftenginelist.h"
-#include "misc/logmessage.h"
+
+#include <tuple>
 
 #include <QStringBuilder>
-#include <tuple>
+
+#include "../fscommon/simulatorfscommonfunctions.h"
+#include "simconnectsymbols.h"
+
+#include "misc/aviation/aircraftenginelist.h"
+#include "misc/aviation/aircraftparts.h"
+#include "misc/logmessage.h"
 
 using namespace swift::misc;
 using namespace swift::misc::aviation;
@@ -409,4 +412,4 @@ namespace swift::simplugin::fsxcommon
                u" 19 (ident): " % QString::number(data[19]);
     }
 
-} // namespace
+} // namespace swift::simplugin::fsxcommon

src/plugins/simulator/fsxcommon/simconnectdatadefinition.h

@@ -6,14 +6,15 @@
 #ifndef SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECT_DATADEFINITION_H
 #define SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECT_DATADEFINITION_H
 
-#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
-#include "plugins/simulator/fsxcommon/simconnectwindows.h"
+#include <algorithm>
+
+#include <QString>
+#include <QtGlobal>
+
 #include "misc/aviation/aircraftlights.h"
 #include "misc/simulation/simulatorinfo.h"
-
-#include <algorithm>
-#include <QtGlobal>
-#include <QString>
+#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
+#include "plugins/simulator/fsxcommon/simconnectwindows.h"
 
 namespace swift::misc::aviation
 {
@@ -352,6 +353,6 @@ namespace swift::simplugin::fsxcommon
         //! Initialize data definition for MSFS transponder
         static HRESULT initMSFSTransponder(const HANDLE hSimConnect);
     };
-} // namespace
+} // namespace swift::simplugin::fsxcommon
 
 #endif // guard

src/plugins/simulator/fsxcommon/simconnectobject.cpp

@@ -2,12 +2,13 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "simconnectobject.h"
-#include "misc/stringutils.h"
+
 #include "simulatorfsxcommon.h"
-#include "core/simulator.h"
+
+#include "config/buildconfig.h"
 #include "core/simulator.h"
 #include "misc/simulation/interpolation/interpolatormulti.h"
-#include "config/buildconfig.h"
+#include "misc/stringutils.h"
 
 using namespace swift::config;
 using namespace swift::misc;
@@ -551,4 +552,4 @@ namespace swift::simplugin::fsxcommon
         }
         return removedObjects;
     }
-} // namespace
+} // namespace swift::simplugin::fsxcommon

src/plugins/simulator/fsxcommon/simconnectobject.h

@@ -6,13 +6,14 @@
 #ifndef SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECTOBJECT_H
 #define SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECTOBJECT_H
 
-#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
-#include "plugins/simulator/fsxcommon/simconnectdatadefinition.h"
-#include "misc/simulation/simulatedaircraft.h"
-#include "misc/simulation/interpolation/interpolatormulti.h"
+#include <QByteArray>
 #include <QSharedPointer>
 #include <QStringList>
-#include <QByteArray>
+
+#include "misc/simulation/interpolation/interpolatormulti.h"
+#include "misc/simulation/simulatedaircraft.h"
+#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
+#include "plugins/simulator/fsxcommon/simconnectdatadefinition.h"
 
 namespace swift::simplugin::fsxcommon
 {
@@ -424,6 +425,6 @@ namespace swift::simplugin::fsxcommon
         //! Aircraft?
         bool containsAircraft() const;
     };
-} // namespace
+} // namespace swift::simplugin::fsxcommon
 
 #endif // guard

src/plugins/simulator/fsxcommon/simconnectsettingscomponent.cpp

@@ -2,20 +2,23 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "simconnectsettingscomponent.h"
-#include "ui_simconnectsettingscomponent.h"
-#include "gui/guiapplication.h"
-#include "core/context/contextapplication.h"
-#include "core/context/contextsimulator.h"
-#include "misc/simulation/fsx/simconnectutilities.h"
-#include "misc/network/networkutils.h"
-#include "misc/logmessage.h"
-#include "config/buildconfig.h"
-#include <QFileInfo>
-#include <QFileDialog>
+
 #include <QDesktopServices>
+#include <QDir>
+#include <QFileDialog>
+#include <QFileInfo>
 #include <QMessageBox>
 #include <QStringBuilder>
-#include <QDir>
+
+#include "ui_simconnectsettingscomponent.h"
+
+#include "config/buildconfig.h"
+#include "core/context/contextapplication.h"
+#include "core/context/contextsimulator.h"
+#include "gui/guiapplication.h"
+#include "misc/logmessage.h"
+#include "misc/network/networkutils.h"
+#include "misc/simulation/fsx/simconnectutilities.h"
 
 using namespace swift::config;
 using namespace swift::misc;
@@ -262,4 +265,4 @@ namespace swift::simplugin::fsxcommon
             this->showOverlayMessage(m);
         }
     }
-} // ns
+} // namespace swift::simplugin::fsxcommon

src/plugins/simulator/fsxcommon/simconnectsettingscomponent.h

@@ -6,13 +6,13 @@
 #ifndef SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECTSETTINGSCOMPONENT_H
 #define SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECTSETTINGSCOMPONENT_H
 
-#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
+#include <QScopedPointer>
+
 #include "gui/overlaymessagesframe.h"
 #include "misc/settingscache.h"
 #include "misc/simulation/settings/simulatorsettings.h"
 #include "misc/simulation/simulatorinfo.h"
-
-#include <QScopedPointer>
+#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
 
 namespace Ui
 {
@@ -70,6 +70,6 @@ namespace swift::simplugin::fsxcommon
         QScopedPointer<Ui::CSimConnectSettingsComponent> ui;
         bool m_p3d64bit = false;
     };
-} // ns
+} // namespace swift::simplugin::fsxcommon
 
 #endif // guard

src/plugins/simulator/fsxcommon/simconnectsymbols.cpp

@@ -2,14 +2,20 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "simconnectsymbols.h"
-#include "misc/stringutils.h"
-#include "misc/logmessage.h"
-#include "misc/logcategories.h"
-#include <QLibrary>
+
+// clang-format off
 #include <Windows.h>
 #include <SimConnect.h>
+// clang-format on
+
 #include <array>
 
+#include <QLibrary>
+
+#include "misc/logcategories.h"
+#include "misc/logmessage.h"
+#include "misc/stringutils.h"
+
 // clazy:excludeall=function-args-by-ref
 
 using namespace swift::misc;

src/plugins/simulator/fsxcommon/simconnectsymbols.h

@@ -6,10 +6,10 @@
 #ifndef SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECTSYMBOLS_H
 #define SWIFT_SIMPLUGIN_FSXCOMMON_SIMCONNECTSYMBOLS_H
 
-#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
-
 #include <QtGlobal>
 
+#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
+
 #ifdef Q_OS_WIN64
 
 //! P3D versions

src/plugins/simulator/fsxcommon/simconnectwindows.h

@@ -15,8 +15,10 @@
 #pragma push_macro("interface")
 #undef interface
 
+// clang-format off
 #include <Windows.h>
 #include <SimConnect.h>
+// clang-format on
 
 #include <QtGlobal>
 

src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp

@@ -2,33 +2,36 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "simulatorfsxcommon.h"
-#include "simconnectsymbols.h"
+
+#include <type_traits>
+
+#include <QElapsedTimer>
+#include <QPointer>
+#include <QStringBuilder>
+#include <QTimer>
+
 #include "../fscommon/simulatorfscommonfunctions.h"
+#include "simconnectsymbols.h"
+
+#include "config/buildconfig.h"
 #include "core/application.h"
+#include "misc/aviation/airportlist.h"
+#include "misc/country.h"
+#include "misc/geo/elevationplane.h"
+#include "misc/logmessage.h"
+#include "misc/math/mathutils.h"
 #include "misc/network/textmessage.h"
-#include "misc/simulation/fsx/simconnectutilities.h"
+#include "misc/simulation/aircraftmodel.h"
 #include "misc/simulation/fscommon/aircraftcfgparser.h"
 #include "misc/simulation/fscommon/bcdconversions.h"
 #include "misc/simulation/fscommon/fscommonutil.h"
-#include "misc/simulation/settings/simulatorsettings.h"
-#include "misc/simulation/aircraftmodel.h"
+#include "misc/simulation/fsx/simconnectutilities.h"
 #include "misc/simulation/interpolation/interpolatormulti.h"
+#include "misc/simulation/settings/simulatorsettings.h"
 #include "misc/simulation/simulatorplugininfo.h"
-#include "misc/aviation/airportlist.h"
-#include "misc/geo/elevationplane.h"
-#include "misc/math/mathutils.h"
-#include "misc/country.h"
-#include "misc/logmessage.h"
 #include "misc/statusmessagelist.h"
 #include "misc/threadutils.h"
 #include "misc/verify.h"
-#include "config/buildconfig.h"
-
-#include <QTimer>
-#include <QPointer>
-#include <QStringBuilder>
-#include <type_traits>
-#include <QElapsedTimer>
 
 using namespace swift::config;
 using namespace swift::misc;
@@ -2965,4 +2968,4 @@ namespace swift::simplugin::fsxcommon
         default: break;
         }
     }
-} // namespace
+} // namespace swift::simplugin::fsxcommon

src/plugins/simulator/fsxcommon/simulatorfsxcommon.h

@@ -6,30 +6,30 @@
 #ifndef SWIFT_SIMPLUGIN_FSXCOMMON_SIMULATORFSXCOMMON_H
 #define SWIFT_SIMPLUGIN_FSXCOMMON_SIMULATORFSXCOMMON_H
 
+#include <QFutureWatcher>
+#include <QHash>
+#include <QList>
+#include <QObject>
+#include <QtPlugin>
+
+#include "config/buildconfig.h"
+#include "core/simulator.h"
+#include "misc/aviation/airportlist.h"
+#include "misc/aviation/altitude.h"
+#include "misc/network/client.h"
+#include "misc/pixmap.h"
+#include "misc/pq/frequency.h"
+#include "misc/simulation/aircraftmodel.h"
+#include "misc/simulation/interpolation/interpolatorlinear.h"
+#include "misc/simulation/settings/simulatorsettings.h"
+#include "misc/simulation/simulatedaircraft.h"
+#include "misc/simulation/simulatorplugininfo.h"
+#include "misc/statusmessage.h"
+#include "plugins/simulator/fscommon/simulatorfscommon.h"
 #include "plugins/simulator/fsxcommon/fsxcommonexport.h"
 #include "plugins/simulator/fsxcommon/simconnectdatadefinition.h"
 #include "plugins/simulator/fsxcommon/simconnectobject.h"
 #include "plugins/simulator/fsxcommon/simconnectwindows.h"
-#include "plugins/simulator/fscommon/simulatorfscommon.h"
-#include "core/simulator.h"
-#include "misc/simulation/interpolation/interpolatorlinear.h"
-#include "misc/simulation/simulatorplugininfo.h"
-#include "misc/simulation/settings/simulatorsettings.h"
-#include "misc/simulation/aircraftmodel.h"
-#include "misc/simulation/simulatedaircraft.h"
-#include "misc/aviation/airportlist.h"
-#include "misc/aviation/altitude.h"
-#include "misc/statusmessage.h"
-#include "misc/network/client.h"
-#include "misc/pixmap.h"
-#include "misc/pq/frequency.h"
-#include "config/buildconfig.h"
-
-#include <QObject>
-#include <QtPlugin>
-#include <QHash>
-#include <QList>
-#include <QFutureWatcher>
 
 namespace swift::simplugin::fsxcommon
 {
@@ -706,6 +706,6 @@ namespace swift::simplugin::fsxcommon
         //! \sa CSimConnectObjects::SimConnectProc
         static void CALLBACK SimConnectProc(SIMCONNECT_RECV *pData, DWORD cbData, void *pContext);
     };
-} // namespace
+} // namespace swift::simplugin::fsxcommon
 
 #endif // guard

src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "simulatorfsxconfigwindow.h"
+
 #include "ui_simulatorfsxconfigwindow.h"
 
 using namespace swift::gui;
@@ -24,4 +25,4 @@ namespace swift::simplugin::fsxcommon
     {
         // void
     }
-} // ns
+} // namespace swift::simplugin::fsxcommon

src/plugins/simulator/fsxcommon/simulatorfsxconfigwindow.h

@@ -6,10 +6,11 @@
 #ifndef SWIFT_SIMPLUGIN_FSXCOMMON_SIMULATORFSXCONFIGWINDOW_H
 #define SWIFT_SIMPLUGIN_FSXCOMMON_SIMULATORFSXCONFIGWINDOW_H
 
-#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
+#include <QScopedPointer>
+
 #include "gui/pluginconfigwindow.h"
 #include "misc/simulation/simulatorinfo.h"
-#include <QScopedPointer>
+#include "plugins/simulator/fsxcommon/fsxcommonexport.h"
 
 namespace Ui
 {
@@ -38,6 +39,6 @@ namespace swift::simplugin::fsxcommon
         const swift::misc::simulation::CSimulatorInfo m_simulator { "FSX" };
         QScopedPointer<Ui::CSimulatorFsxConfigWindow> ui;
     };
-} // ns
+} // namespace swift::simplugin::fsxcommon
 
 #endif // guard

src/plugins/simulator/fsxcommon/simulatorfsxsimconnectproc.cpp

@@ -1,17 +1,18 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "simulatorfsxcommon.h"
+#include <cstring>
+
 #include "simconnectdatadefinition.h"
+#include "simulatorfsxcommon.h"
+
+#include "config/buildconfig.h"
 #include "core/application.h"
+#include "misc/aviation/airportlist.h"
+#include "misc/logmessage.h"
 #include "misc/simulation/fscommon/bcdconversions.h"
 #include "misc/simulation/fsx/simconnectutilities.h"
 #include "misc/simulation/simulatorplugininfo.h"
-#include "misc/aviation/airportlist.h"
-#include "misc/logmessage.h"
-#include "config/buildconfig.h"
-
-#include <cstring>
 
 using namespace swift::core;
 using namespace swift::config;
@@ -410,4 +411,4 @@ namespace swift::simplugin::fsxcommon
             simulatorFsxP3D->m_dispatchProcMaxTimeMs = simulatorFsxP3D->m_dispatchProcTimeMs;
         }
     } // method
-} // namespace
+} // namespace swift::simplugin::fsxcommon