refactor: clang-format

src/misc/test/testdata.cpp

@@ -2,16 +2,17 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "misc/test/testdata.h"
-#include "misc/simulation/simulatedaircraft.h"
+
 #include "misc/aviation/atcstationlist.h"
 #include "misc/aviation/flightplan.h"
-#include "misc/network/userlist.h"
-#include "misc/network/server.h"
-#include "misc/fileutils.h"
-#include "misc/swiftdirectories.h"
 #include "misc/directoryutils.h"
-#include "misc/variantlist.h"
+#include "misc/fileutils.h"
 #include "misc/math/mathutils.h"
+#include "misc/network/server.h"
+#include "misc/network/userlist.h"
+#include "misc/simulation/simulatedaircraft.h"
+#include "misc/swiftdirectories.h"
+#include "misc/variantlist.h"
 
 using namespace swift::misc::aviation;
 using namespace swift::misc::geo;
@@ -319,5 +320,5 @@ namespace swift::misc::test
         static const CSimulatedAircraft aircraft(getA320AircraftImpl());
         return aircraft;
     }
-} // ns
+} // namespace swift::misc::test
 //! \endcond

src/misc/test/testdata.h

@@ -24,7 +24,7 @@ namespace swift::misc
         class CAirlineIcaoCode;
         class CLivery;
         class CFlightPlan;
-    }
+    } // namespace aviation
     namespace geo
     {
         class CCoordinateGeodetic;
@@ -34,12 +34,12 @@ namespace swift::misc
         class CUser;
         class CUserList;
         class CServer;
-    }
+    } // namespace network
     namespace simulation
     {
         class CAircraftModel;
         class CSimulatedAircraft;
-    }
+    } // namespace simulation
 
     namespace test
     {
@@ -140,7 +140,7 @@ namespace swift::misc
             //! Prefilled flightplan from EDDM-EDDF
             static const swift::misc::aviation::CFlightPlan &getFlightPlan();
         };
-    } // ns
-} // ns
+    } // namespace test
+} // namespace swift::misc
 
 #endif

src/misc/test/testing.cpp

@@ -2,6 +2,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "misc/test/testing.h"
+
+#include <tuple>
+
+#include <QDateTime>
+#include <QList>
+#include <QStringList>
+#include <QtGlobal>
+
 #include "misc/aviation/callsign.h"
 #include "misc/geo/coordinategeodetic.h"
 #include "misc/iterator.h"
@@ -14,12 +22,6 @@
 #include "misc/sequence.h"
 #include "misc/variant.h"
 
-#include <QDateTime>
-#include <QList>
-#include <QStringList>
-#include <QtGlobal>
-#include <tuple>
-
 using namespace swift::misc::aviation;
 using namespace swift::misc::geo;
 using namespace swift::misc::network;
@@ -126,4 +128,4 @@ namespace swift::misc::test
         }
         return list;
     }
-} // namespace
+} // namespace swift::misc::test

src/misc/test/testing.h

@@ -6,13 +6,14 @@
 #ifndef SWIFT_MISC_TEST_TESTING_H
 #define SWIFT_MISC_TEST_TESTING_H
 
-#include "misc/simulation/fscommon/aircraftcfgentrieslist.h"
-#include "misc/aviation/atcstationlist.h"
-#include "misc/aviation/airportlist.h"
-#include "misc/network/clientlist.h"
-#include "misc/swiftmiscexport.h"
 #include <QString>
 
+#include "misc/aviation/airportlist.h"
+#include "misc/aviation/atcstationlist.h"
+#include "misc/network/clientlist.h"
+#include "misc/simulation/fscommon/aircraftcfgentrieslist.h"
+#include "misc/swiftmiscexport.h"
+
 //! Generate data for testing purposes.
 namespace swift::misc::test
 {
@@ -35,6 +36,6 @@ namespace swift::misc::test
         //! Get clients
         static swift::misc::network::CClientList getClients(int number);
     };
-} // ns
+} // namespace swift::misc::test
 
 #endif

src/misc/test/testservice.cpp

@@ -2,24 +2,25 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "misc/test/testservice.h"
-#include "misc/test/testing.h"
-#include "misc/dbusutils.h"
-#include "misc/aviation/callsign.h"
-#include "misc/aviation/comsystem.h"
-#include "misc/aviation/track.h"
-#include "misc/dbus.h"
-#include "misc/pq/frequency.h"
-#include "misc/pq/units.h"
-#include "misc/stringutils.h"
 
 #include <QDBusArgument>
-#include <QDBusObjectPath>
 #include <QDBusError>
+#include <QDBusObjectPath>
 #include <QDebug>
 #include <QVariant>
 #include <QtDebug>
 #include <QtGlobal>
 
+#include "misc/aviation/callsign.h"
+#include "misc/aviation/comsystem.h"
+#include "misc/aviation/track.h"
+#include "misc/dbus.h"
+#include "misc/dbusutils.h"
+#include "misc/pq/frequency.h"
+#include "misc/pq/units.h"
+#include "misc/stringutils.h"
+#include "misc/test/testing.h"
+
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::simulation;
@@ -348,4 +349,4 @@ namespace swift::misc::test
         }
         return paths;
     }
-} // ns
+} // namespace swift::misc::test

src/misc/test/testservice.h

@@ -10,6 +10,14 @@
 #pragma push_macro("interface")
 #undef interface
 
+#include <QDBusConnection>
+#include <QDBusObjectPath>
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <QTextStream>
+#include <QVariantList>
+
 #include "misc/aviation/aircrafticaocode.h"
 #include "misc/aviation/aircraftsituation.h"
 #include "misc/aviation/airportlist.h"
@@ -26,21 +34,13 @@
 #include "misc/pq/speed.h"
 #include "misc/propertyindexref.h"
 #include "misc/propertyindexvariantmap.h"
-#include "misc/variantlist.h"
 #include "misc/simulation/fscommon/aircraftcfgentrieslist.h"
 #include "misc/simulation/simulatedaircraft.h"
 #include "misc/simulation/simulatedaircraftlist.h"
 #include "misc/simulation/simulatorplugininfo.h"
-#include "misc/variant.h"
 #include "misc/swiftmiscexport.h"
-
-#include <QList>
-#include <QObject>
-#include <QString>
-#include <QTextStream>
-#include <QVariantList>
-#include <QDBusConnection>
-#include <QDBusObjectPath>
+#include "misc/variant.h"
+#include "misc/variantlist.h"
 
 // clazy:excludeall=const-signal-or-slot
 
@@ -52,7 +52,7 @@ namespace swift::misc::aviation
     class CCallsign;
     class CComSystem;
     class CTrack;
-}
+} // namespace swift::misc::aviation
 
 //! DBus interface for test service
 #define SWIFT_MISC_TESTSERVICE_INTERFACENAME "misc.test"
@@ -227,7 +227,7 @@ namespace swift::misc::test
         static QTextStream &err();
         bool m_verbose = true;
     };
-} // ns
+} // namespace swift::misc::test
 
 #pragma pop_macro("interface")
 

src/misc/test/testserviceinterface.cpp

@@ -2,12 +2,14 @@
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 #include "misc/test/testserviceinterface.h"
-#include "misc/test/testservice.h"
-#include "misc/test/testing.h"
-#include "misc/test/testdata.h"
-#include "misc/aviation/flightplan.h"
+
 #include <QTextStream>
 
+#include "misc/aviation/flightplan.h"
+#include "misc/test/testdata.h"
+#include "misc/test/testing.h"
+#include "misc/test/testservice.h"
+
 class QDBusConnection;
 
 using namespace swift::misc;
@@ -170,4 +172,4 @@ namespace swift::misc::test
         static const QString sError(": !! ERROR !!");
         return ok ? sOk : sError;
     }
-} // ns
+} // namespace swift::misc::test

src/misc/test/testserviceinterface.h

@@ -6,7 +6,16 @@
 #ifndef SWIFT_MISC_TEST_TESTSERVICEINTERFACE_H
 #define SWIFT_MISC_TEST_TESTSERVICEINTERFACE_H
 
-#include "misc/swiftmiscexport.h"
+#include <QDBusAbstractInterface>
+#include <QDBusPendingCall>
+#include <QDBusPendingReply>
+#include <QLatin1String>
+#include <QList>
+#include <QObject>
+#include <QString>
+#include <QTextStream>
+#include <QVariant>
+
 #include "misc/aviation/aircrafticaocode.h"
 #include "misc/aviation/aircraftsituation.h"
 #include "misc/aviation/airportlist.h"
@@ -30,18 +39,9 @@
 #include "misc/simulation/simulatedaircraft.h"
 #include "misc/simulation/simulatedaircraftlist.h"
 #include "misc/simulation/simulatorplugininfo.h"
+#include "misc/swiftmiscexport.h"
 #include "misc/variantlist.h"
 
-#include <QDBusAbstractInterface>
-#include <QDBusPendingCall>
-#include <QDBusPendingReply>
-#include <QLatin1String>
-#include <QList>
-#include <QObject>
-#include <QString>
-#include <QVariant>
-#include <QTextStream>
-
 class QDBusConnection;
 class QDBusObjectPath;
 class QDBusVariant;
@@ -53,7 +53,7 @@ namespace swift::misc
     {
         class CAircraftCfgEntriesList;
     }
-}
+} // namespace swift::misc
 
 namespace swift::misc::test
 {
@@ -418,5 +418,5 @@ namespace swift::misc::test
         //! Error info string
         static const QString &errorInfo(bool ok);
     };
-} // ns
+} // namespace swift::misc::test
 #endif