refactor: clang-format

samples/afvclient/afvclientbridge.h

@@ -6,9 +6,10 @@
 #ifndef SAMPLES_AFVCLIENTBRIDGE_H
 #define SAMPLES_AFVCLIENTBRIDGE_H
 
-#include "core/afv/clients/afvclient.h"
 #include <QObject>
 
+#include "core/afv/clients/afvclient.h"
+
 //! Bridge, running in main thread -> voice client in own thread
 class CAfvClientBridge : public QObject
 {

samples/afvclient/main.cpp

@@ -1,24 +1,24 @@
 // SPDX-FileCopyrightText: Copyright (C) 2019 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "afvclientbridge.h"
-#include "core/afv/model/atcstationmodel.h"
-#include "core/afv/model/afvmapreader.h"
-#include "core/afv/clients/afvclient.h"
-#include "core/registermetadata.h"
-
-#include "core/application.h"
-#include "misc/network/user.h"
-#include "misc/obfuscation.h"
-#include "config/buildconfig.h"
-
 #include <QGuiApplication>
+#include <QPointer>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
-#include <QPointer>
 #include <QThread>
 #include <QTimer>
 
+#include "afvclientbridge.h"
+
+#include "config/buildconfig.h"
+#include "core/afv/clients/afvclient.h"
+#include "core/afv/model/afvmapreader.h"
+#include "core/afv/model/atcstationmodel.h"
+#include "core/application.h"
+#include "core/registermetadata.h"
+#include "misc/network/user.h"
+#include "misc/obfuscation.h"
+
 using namespace swift::config;
 using namespace swift::misc;
 using namespace swift::misc::network;

samples/fsd/main.cpp

@@ -4,12 +4,13 @@
 //! \file
 //! \ingroup samplefsd
 
+#include <QCoreApplication>
+#include <QThread>
+
 #include "core/fsd/fsdclient.h"
 #include "misc/network/clientprovider.h"
 #include "misc/simulation/ownaircraftproviderdummy.h"
 #include "misc/simulation/remoteaircraftproviderdummy.h"
-#include <QCoreApplication>
-#include <QThread>
 
 using namespace swift::misc::network;
 using namespace swift::misc::simulation;

samples/hotkey/main.cpp

@@ -4,11 +4,11 @@
 //! \file
 //! \ingroup samplehotkey
 
-#include "misc/directoryutils.h"
+#include <QApplication>
+
 #include "gui/components/settingshotkeycomponent.h"
 #include "gui/guiapplication.h"
-
-#include <QApplication>
+#include "misc/directoryutils.h"
 
 using namespace swift::misc;
 using namespace swift::gui;

samples/misc/main.cpp

@@ -1,21 +1,23 @@
 // SPDX-FileCopyrightText: Copyright (C) 2013 swift Project Community / Contributors
 // SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
-#include "core/application.h"
-#include "misc/directoryutils.h"
-#include "samplesalgorithm.h"
-#include "sampleschangeobject.h"
-#include "samplescontainer.h"
-#include "samplesjson.h"
-#include "samplesmetadata.h"
-#include "samplesperformance.h"
-#include "samplesfile.h"
-
 #include <stdio.h>
+
 #include <QCoreApplication>
 #include <QString>
 #include <QTextStream>
 
+#include "samplesalgorithm.h"
+#include "sampleschangeobject.h"
+#include "samplescontainer.h"
+#include "samplesfile.h"
+#include "samplesjson.h"
+#include "samplesmetadata.h"
+#include "samplesperformance.h"
+
+#include "core/application.h"
+#include "misc/directoryutils.h"
+
 //! \file
 //! \ingroup samplekmisc
 

samples/misc/samplesalgorithm.cpp

@@ -5,10 +5,11 @@
 //! \ingroup samplemisc
 
 #include "samplesalgorithm.h"
-#include "misc/algorithm.h"
-#include "misc/iterator.h"
-#include "misc/sequence.h"
-#include "misc/stringutils.h"
+
+#include <algorithm>
+#include <cmath>
+#include <ctime>
+#include <numeric>
 
 #include <QChar>
 #include <QDebug>
@@ -17,10 +18,11 @@
 #include <QStringList>
 #include <QTypeInfo>
 #include <QtDebug>
-#include <algorithm>
-#include <cmath>
-#include <ctime>
-#include <numeric>
+
+#include "misc/algorithm.h"
+#include "misc/iterator.h"
+#include "misc/sequence.h"
+#include "misc/stringutils.h"
 
 namespace swift::sample
 {
@@ -80,4 +82,4 @@ namespace swift::sample
         return 0;
     }
 
-} // namespace
+} // namespace swift::sample

samples/misc/samplesalgorithm.h

@@ -16,6 +16,6 @@ namespace swift::sample
         //! Run the samples
         static int samples();
     };
-} // namespace
+} // namespace swift::sample
 
 #endif

samples/misc/sampleschangeobject.cpp

@@ -5,6 +5,10 @@
 //! \ingroup samplemisc
 
 #include "sampleschangeobject.h"
+
+#include <QDateTime>
+#include <QtDebug>
+
 #include "misc/aviation/atcstation.h"
 #include "misc/aviation/atcstationlist.h"
 #include "misc/aviation/callsign.h"
@@ -17,9 +21,6 @@
 #include "misc/propertyindexvariantmap.h"
 #include "misc/variant.h"
 
-#include <QDateTime>
-#include <QtDebug>
-
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::physical_quantities;
@@ -73,4 +74,4 @@ namespace swift::sample
         qDebug() << "-----------------------------------------------";
         return 0;
     }
-} // namespace
+} // namespace swift::sample

samples/misc/sampleschangeobject.h

@@ -16,6 +16,6 @@ namespace swift::sample
         //! Run the samples
         static int samples();
     };
-} // namespace
+} // namespace swift::sample
 
 #endif

samples/misc/samplescontainer.cpp

@@ -5,12 +5,16 @@
 //! \ingroup samplemisc
 
 #include "samplescontainer.h"
-#include "misc/test/testdata.h"
+
+#include <QDateTime>
+#include <QDebug>
+#include <QtDebug>
+
 #include "misc/aviation/atcstation.h"
 #include "misc/aviation/atcstationlist.h"
 #include "misc/aviation/callsign.h"
-#include "misc/mixin/mixincompare.h"
 #include "misc/geo/coordinategeodetic.h"
+#include "misc/mixin/mixincompare.h"
 #include "misc/network/user.h"
 #include "misc/pq/frequency.h"
 #include "misc/pq/length.h"
@@ -19,12 +23,9 @@
 #include "misc/propertyindexvariantmap.h"
 #include "misc/range.h"
 #include "misc/stringutils.h"
+#include "misc/test/testdata.h"
 #include "misc/variant.h"
 
-#include <QDateTime>
-#include <QDebug>
-#include <QtDebug>
-
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::physical_quantities;
@@ -87,4 +88,4 @@ namespace swift::sample
 
         return 0;
     }
-} // namespace
+} // namespace swift::sample

samples/misc/samplescontainer.h

@@ -16,6 +16,6 @@ namespace swift::sample
         //! Run the samples
         static int samples();
     };
-} // namespace
+} // namespace swift::sample
 
 #endif

samples/misc/samplesfile.cpp

@@ -5,6 +5,7 @@
 //! \ingroup samplemisc
 
 #include "samplesfile.h"
+
 #include "misc/directoryutils.h"
 #include "misc/stringutils.h"
 
@@ -21,4 +22,4 @@ namespace swift::sample
         return 0;
     }
 
-} // namespace
+} // namespace swift::sample

samples/misc/samplesfile.h

@@ -18,6 +18,6 @@ namespace swift::sample
         //! Run the samples
         static int samples(QTextStream &out);
     };
-} // namespace
+} // namespace swift::sample
 
 #endif

samples/misc/samplesjson.cpp

@@ -5,6 +5,16 @@
 //! \ingroup samplemisc
 
 #include "samplesjson.h"
+
+#include <stdio.h>
+
+#include <QDateTime>
+#include <QDebug>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QTextStream>
+#include <QtDebug>
+
 #include "misc/aviation/aircrafticaocode.h"
 #include "misc/aviation/aircraftsituation.h"
 #include "misc/aviation/airlineicaocode.h"
@@ -23,16 +33,8 @@
 #include "misc/pq/speed.h"
 #include "misc/pq/units.h"
 #include "misc/simulation/simulatedaircraft.h"
-#include "misc/test/testdata.h"
 #include "misc/stringutils.h"
-
-#include <stdio.h>
-#include <QDateTime>
-#include <QDebug>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QTextStream>
-#include <QtDebug>
+#include "misc/test/testdata.h"
 
 using namespace swift::misc;
 using namespace swift::misc::aviation;
@@ -106,4 +108,4 @@ namespace swift::sample
 
         return 0;
     }
-} // namespace
+} // namespace swift::sample

samples/misc/samplesjson.h

@@ -17,6 +17,6 @@ namespace swift::sample
         //! Run the samples
         static int samples();
     };
-} // namespace
+} // namespace swift::sample
 
 #endif

samples/misc/samplesmetadata.cpp

@@ -5,12 +5,14 @@
 //! \ingroup samplemisc
 
 #include "samplesmetadata.h"
-#include "misc/metadatautils.h"
-#include "misc/registermetadata.h"
 
 #include <stdio.h>
+
 #include <QTextStream>
 
+#include "misc/metadatautils.h"
+#include "misc/registermetadata.h"
+
 namespace swift::sample
 {
     int CSamplesMetadata::samples()
@@ -25,4 +27,4 @@ namespace swift::sample
         return 0;
     }
 
-} // namespace
+} // namespace swift::sample

samples/misc/samplesmetadata.h

@@ -17,6 +17,6 @@ namespace swift::sample
         //! Run the samples
         static int samples();
     };
-} // namespace
+} // namespace swift::sample
 
 #endif

samples/misc/samplesperformance.cpp

@@ -5,9 +5,25 @@
 //! \ingroup samplemisc
 
 #include "samplesperformance.h"
+
+#include <algorithm>
+#include <iterator>
+
+#include <QDateTime>
+#include <QElapsedTimer>
+#include <QHash>
+#include <QList>
+#include <QRegExp>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
+#include <QString>
+#include <QStringBuilder>
+#include <QStringList>
+#include <QTextStream>
+#include <QVector>
+#include <Qt>
+
 #include "core/db/databasereader.h"
-#include "misc/simulation/aircraftmodellist.h"
-#include "misc/simulation/distributorlist.h"
 #include "misc/aviation/aircrafticaocodelist.h"
 #include "misc/aviation/aircraftsituation.h"
 #include "misc/aviation/aircraftsituationlist.h"
@@ -16,29 +32,15 @@
 #include "misc/aviation/atcstationlist.h"
 #include "misc/aviation/callsign.h"
 #include "misc/aviation/liverylist.h"
+#include "misc/directoryutils.h"
 #include "misc/geo/coordinategeodetic.h"
 #include "misc/math/mathutils.h"
 #include "misc/pq/units.h"
-#include "misc/test/testing.h"
-#include "misc/swiftdirectories.h"
-#include "misc/directoryutils.h"
+#include "misc/simulation/aircraftmodellist.h"
+#include "misc/simulation/distributorlist.h"
 #include "misc/stringutils.h"
-
-#include <QDateTime>
-#include <QHash>
-#include <QList>
-#include <QRegExp>
-#include <QRegularExpression>
-#include <QRegularExpressionMatch>
-#include <QString>
-#include <QStringList>
-#include <QStringBuilder>
-#include <QTextStream>
-#include <QElapsedTimer>
-#include <QVector>
-#include <Qt>
-#include <algorithm>
-#include <iterator>
+#include "misc/swiftdirectories.h"
+#include "misc/test/testing.h"
 
 using namespace swift::misc;
 using namespace swift::misc::aviation;
@@ -865,4 +867,4 @@ namespace swift::sample
         }
         return r;
     }
-} // namespace
+} // namespace swift::sample

samples/misc/samplesperformance.h

@@ -7,14 +7,15 @@
 #ifndef SWIFT_SAMPLE_SAMPLESPERFORMANCE_H
 #define SWIFT_SAMPLE_SAMPLESPERFORMANCE_H
 
-#include "misc/simulation/aircraftmodellist.h"
+#include <QHash>
+#include <QMap>
+#include <QTextStream>
+#include <QtGlobal>
+
 #include "misc/aviation/aircraftsituationlist.h"
 #include "misc/aviation/atcstationlist.h"
 #include "misc/aviation/callsignset.h"
-#include <QTextStream>
-#include <QtGlobal>
-#include <QMap>
-#include <QHash>
+#include "misc/simulation/aircraftmodellist.h"
 
 class QTextStream;
 
@@ -96,6 +97,6 @@ namespace swift::sample
         //! Situations hash
         static QHash<swift::misc::aviation::CCallsign, swift::misc::aviation::CAircraftSituation> situationsHash(const swift::misc::aviation::CCallsignSet &callsigns);
     };
-} // namespace
+} // namespace swift::sample
 
 #endif

samples/miscdbus/main.cpp

@@ -4,14 +4,8 @@
 //! \file
 //! \ingroup samplemiscdbus
 
-#include "misc/dbusserver.h"
-#include "misc/directoryutils.h"
-#include "misc/registermetadata.h"
-#include "misc/network/networkutils.h"
-#include "misc/dbusutils.h"
-#include "misc/processctrl.h"
-#include "servicetool.h"
 #include <stdio.h>
+
 #include <QCoreApplication>
 #include <QDBusServer>
 #include <QDebug>
@@ -23,6 +17,15 @@
 #include <Qt>
 #include <QtDebug>
 
+#include "servicetool.h"
+
+#include "misc/dbusserver.h"
+#include "misc/dbusutils.h"
+#include "misc/directoryutils.h"
+#include "misc/network/networkutils.h"
+#include "misc/processctrl.h"
+#include "misc/registermetadata.h"
+
 using namespace swift::misc;
 
 //! main

samples/miscdbus/servicetool.cpp

@@ -5,15 +5,10 @@
 //! \ingroup samplemiscdbus
 
 #include "servicetool.h"
-#include "core/application.h"
-#include "misc/test/testservice.h"
-#include "misc/test/testserviceinterface.h"
-#include "misc/dbusserver.h"
-#include "misc/network/server.h"
-#include "misc/test/testdata.h"
 
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <QChar>
 #include <QDBusConnection>
 #include <QDBusConnectionInterface>
@@ -37,6 +32,13 @@
 #include <QVariant>
 #include <QtDebug>
 
+#include "core/application.h"
+#include "misc/dbusserver.h"
+#include "misc/network/server.h"
+#include "misc/test/testdata.h"
+#include "misc/test/testservice.h"
+#include "misc/test/testserviceinterface.h"
+
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::misc::physical_quantities;
@@ -294,4 +296,4 @@ namespace swift::sample
             }
         }
     }
-} // namespace
+} // namespace swift::sample

samples/miscdbus/servicetool.h

@@ -44,6 +44,6 @@ namespace swift::sample
         //! No constructor
         ServiceTool() = delete;
     };
-} // namespace
+} // namespace swift::sample
 
 #endif // guard

samples/miscquantities/main.cpp

@@ -4,18 +4,20 @@
 //! \file
 //! \ingroup samplemiscquantities
 
-#include "samplesaviation.h"
-#include "samplesgeo.h"
-#include "samplesphysicalquantities.h"
-#include "core/application.h"
-#include "misc/directoryutils.h"
-
 #include <stdio.h>
+
 #include <QCoreApplication>
 #include <QIODevice>
 #include <QTextStream>
 #include <QtGlobal>
 
+#include "samplesaviation.h"
+#include "samplesgeo.h"
+#include "samplesphysicalquantities.h"
+
+#include "core/application.h"
+#include "misc/directoryutils.h"
+
 using namespace swift::misc;
 using namespace swift::sample;
 using namespace swift::core;

samples/miscquantities/samplesaviation.cpp

@@ -5,6 +5,11 @@
 //! \ingroup samplemiscquantities
 
 #include "samplesaviation.h"
+
+#include <QDateTime>
+#include <QString>
+#include <QTextStream>
+
 #include "misc/aviation/airporticaocode.h"
 #include "misc/aviation/altitude.h"
 #include "misc/aviation/atcstation.h"
@@ -14,19 +19,15 @@
 #include "misc/aviation/heading.h"
 #include "misc/aviation/navsystem.h"
 #include "misc/aviation/transponder.h"
-#include "misc/mixin/mixincompare.h"
 #include "misc/geo/coordinategeodetic.h"
+#include "misc/mixin/mixincompare.h"
 #include "misc/network/user.h"
 #include "misc/pq/frequency.h"
 #include "misc/pq/length.h"
 #include "misc/pq/units.h"
-#include "misc/test/testdata.h"
 #include "misc/range.h"
 #include "misc/stringutils.h"
-
-#include <QDateTime>
-#include <QString>
-#include <QTextStream>
+#include "misc/test/testdata.h"
 
 using namespace swift::misc;
 using namespace swift::misc::aviation;
@@ -96,4 +97,4 @@ namespace swift::sample
 
         return 0;
     }
-} // namespace
+} // namespace swift::sample

samples/miscquantities/samplesaviation.h

@@ -19,6 +19,6 @@ namespace swift::sample
         //! Run the samples
         static int samples(QTextStream &out);
     };
-} // namespace
+} // namespace swift::sample
 
 #endif

samples/miscquantities/samplesgeo.cpp

@@ -5,6 +5,11 @@
 //! \ingroup samplemiscquantities
 
 #include "samplesgeo.h"
+
+#include <QString>
+#include <QTextStream>
+#include <QVector3D>
+
 #include "misc/aviation/altitude.h"
 #include "misc/geo/coordinategeodetic.h"
 #include "misc/geo/earthangle.h"
@@ -14,10 +19,6 @@
 #include "misc/pq/units.h"
 #include "misc/stringutils.h"
 
-#include <QString>
-#include <QTextStream>
-#include <QVector3D>
-
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::physical_quantities;
@@ -70,4 +71,4 @@ namespace swift::sample
         out << "-----------------------------------------------" << Qt::endl;
         return 0;
     }
-} // namespace
+} // namespace swift::sample

samples/miscquantities/samplesgeo.h

@@ -18,6 +18,6 @@ namespace swift::sample
         //! Run the samples
         static int samples(QTextStream &out);
     };
-}
+} // namespace swift::sample
 
 #endif // guard

samples/miscquantities/samplesphysicalquantities.cpp

@@ -5,6 +5,10 @@
 //! \ingroup samplekmiscquantities
 
 #include "samplesphysicalquantities.h"
+
+#include <QString>
+#include <QTextStream>
+
 #include "misc/aviation/altitude.h"
 #include "misc/pq/acceleration.h"
 #include "misc/pq/angle.h"
@@ -19,9 +23,6 @@
 #include "misc/pq/units.h"
 #include "misc/stringutils.h"
 
-#include <QString>
-#include <QTextStream>
-
 using namespace swift::misc;
 using namespace swift::misc::aviation;
 using namespace swift::misc::physical_quantities;
@@ -128,4 +129,4 @@ namespace swift::sample
         out << "-----------------------------------------------" << Qt::endl;
         return 0;
     }
-} // namespace
+} // namespace swift::sample

samples/miscquantities/samplesphysicalquantities.h

@@ -19,6 +19,6 @@ namespace swift::sample
         //! Run the samples
         static int samples(QTextStream &out);
     };
-}
+} // namespace swift::sample
 
 #endif // guard

samples/miscsim/main.cpp

@@ -4,23 +4,25 @@
 //! \file
 //! \ingroup samplemiscsim
 
-#include "samplesfscommon.h"
-#include "samplesfsx.h"
-#include "samplesp3d.h"
-#include "samplesfsuipc.h"
-#include "samplesmodelmapping.h"
-#include "samplesvpilotrules.h"
-#include "core/application.h"
-#include "misc/directoryutils.h"
-
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <QCoreApplication>
+#include <QElapsedTimer>
 #include <QString>
 #include <QTextStream>
-#include <QElapsedTimer>
 #include <QtGlobal>
 
+#include "samplesfscommon.h"
+#include "samplesfsuipc.h"
+#include "samplesfsx.h"
+#include "samplesmodelmapping.h"
+#include "samplesp3d.h"
+#include "samplesvpilotrules.h"
+
+#include "core/application.h"
+#include "misc/directoryutils.h"
+
 using namespace swift::misc;
 using namespace swift::sample;
 

samples/miscsim/samplesfscommon.cpp

@@ -5,21 +5,23 @@
 //! \ingroup samplemiscsim
 
 #include "samplesfscommon.h"
-#include "sampleutils.h"
-#include "misc/simulation/fscommon/aircraftcfgentrieslist.h"
-#include "misc/simulation/fscommon/aircraftcfgparser.h"
-#include "misc/simulation/settings/simulatorsettings.h"
-#include "misc/simulation/simulatorinfo.h"
 
 #include <QByteArray>
+#include <QDir>
+#include <QElapsedTimer>
 #include <QJsonDocument>
 #include <QString>
 #include <QTemporaryFile>
 #include <QTextStream>
-#include <QElapsedTimer>
-#include <QDir>
 #include <QtGlobal>
 
+#include "sampleutils.h"
+
+#include "misc/simulation/fscommon/aircraftcfgentrieslist.h"
+#include "misc/simulation/fscommon/aircraftcfgparser.h"
+#include "misc/simulation/settings/simulatorsettings.h"
+#include "misc/simulation/simulatorinfo.h"
+
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::misc::simulation::fscommon;
@@ -83,4 +85,4 @@ namespace swift::sample
         // restore settings: DO NOT SAVE !!!
         multiSettings.setSettings(originalSettings, sim);
     }
-} // namespace
+} // namespace swift::sample

samples/miscsim/samplesfscommon.h

@@ -18,6 +18,6 @@ namespace swift::sample
         //! Run the samples
         static void samples(QTextStream &streamOut, QTextStream &streamIn);
     };
-} // namespace
+} // namespace swift::sample
 
 #endif

samples/miscsim/samplesfsuipc.cpp

@@ -4,13 +4,14 @@
 //! \file
 //! \ingroup samplemiscsim
 
-#include "plugins/simulator/fscommon/fsuipc.h"
 #include "samplesfsuipc.h"
-#include "misc/simulation/simulatedaircraft.h"
-#include "misc/registermetadata.h"
 
-#include <QTextStream>
 #include <QScopedPointer>
+#include <QTextStream>
+
+#include "misc/registermetadata.h"
+#include "misc/simulation/simulatedaircraft.h"
+#include "plugins/simulator/fscommon/fsuipc.h"
 
 using namespace swift::misc;
 using namespace swift::misc::simulation;
@@ -52,4 +53,4 @@ namespace swift::sample
     }
 #endif
 
-} // namespace
+} // namespace swift::sample

samples/miscsim/samplesfsuipc.h

@@ -18,6 +18,6 @@ namespace swift::sample
         //! Run the misc. samples
         static void samplesFsuipc(QTextStream &streamOut);
     };
-} // namespace
+} // namespace swift::sample
 
 #endif

samples/miscsim/samplesfsx.cpp

@@ -5,11 +5,12 @@
 //! \ingroup samplemiscsim
 
 #include "samplesfsx.h"
-#include "misc/simulation/fsx/simconnectutilities.h"
-#include "misc/registermetadata.h"
 
 #include <QTextStream>
 
+#include "misc/registermetadata.h"
+#include "misc/simulation/fsx/simconnectutilities.h"
+
 using namespace swift::misc::simulation::fsx;
 
 namespace swift::sample
@@ -21,4 +22,4 @@ namespace swift::sample
         streamOut << CSimConnectUtilities::simConnectExceptionToString(CSimConnectUtilities::SIMCONNECT_EXCEPTION_ILLEGAL_OPERATION) << Qt::endl;
         streamOut << CSimConnectUtilities::simConnectSurfaceTypeToString(CSimConnectUtilities::Bituminus) << Qt::endl;
     }
-} // namespace
+} // namespace swift::sample

samples/miscsim/samplesfsx.h

@@ -18,6 +18,6 @@ namespace swift::sample
         //! Run the misc. samples
         static void samplesMisc(QTextStream &streamOut);
     };
-} // namespace
+} // namespace swift::sample
 
 #endif

samples/miscsim/samplesmodelmapping.cpp

@@ -5,24 +5,26 @@
 //! \ingroup samplemiscsim
 
 #include "samplesmodelmapping.h"
-#include "sampleutils.h"
-#include "core/aircraftmatcher.h"
-#include "misc/aviation/aircrafticaocode.h"
-#include "misc/aviation/airlineicaocode.h"
-#include "misc/simulation/aircraftmodellist.h"
-#include "misc/simulation/aircraftmodelloader.h"
-#include "misc/simulation/settings/simulatorsettings.h"
-#include "misc/simulation/fscommon/aircraftcfgentrieslist.h"
-#include "misc/simulation/fscommon/aircraftcfgparser.h"
-#include "misc/simulation/fscommon/vpilotrulesreader.h"
-#include "misc/simulation/simulatorinfo.h"
-#include "misc/stringutils.h"
 
 #include <QFlags>
 #include <QString>
 #include <QStringList>
 #include <QTextStream>
 
+#include "sampleutils.h"
+
+#include "core/aircraftmatcher.h"
+#include "misc/aviation/aircrafticaocode.h"
+#include "misc/aviation/airlineicaocode.h"
+#include "misc/simulation/aircraftmodellist.h"
+#include "misc/simulation/aircraftmodelloader.h"
+#include "misc/simulation/fscommon/aircraftcfgentrieslist.h"
+#include "misc/simulation/fscommon/aircraftcfgparser.h"
+#include "misc/simulation/fscommon/vpilotrulesreader.h"
+#include "misc/simulation/settings/simulatorsettings.h"
+#include "misc/simulation/simulatorinfo.h"
+#include "misc/stringutils.h"
+
 using namespace swift::core;
 using namespace swift::misc;
 using namespace swift::misc::simulation;
@@ -70,4 +72,4 @@ namespace swift::sample
         // restore settings: DO NOT SAVE !!!
         multiSettings.setSettings(originalSettings, sim);
     }
-} // namespace
+} // namespace swift::sample

samples/miscsim/samplesmodelmapping.h

@@ -18,6 +18,6 @@ namespace swift::sample
         //! Run the samples
         static void samples(QTextStream &streamOut, QTextStream &streamIn);
     };
-} // namespace
+} // namespace swift::sample
 
 #endif

samples/miscsim/samplesp3d.cpp

@@ -5,9 +5,11 @@
 //! \ingroup samplemiscsim
 
 #include "samplesp3d.h"
+
+#include <QTextStream>
+
 #include "misc/simulation/fscommon/fsdirectories.h"
 #include "misc/stringutils.h"
-#include <QTextStream>
 
 using namespace swift::misc::simulation::fscommon;
 
@@ -26,4 +28,4 @@ namespace swift::sample
         const QSet<QString> simObjectPaths = CFsDirectories::fsxSimObjectsPaths("B:/fsx.cfg", false);
         streamOut << swift::misc::joinStringSet(simObjectPaths, ", ") << Qt::endl;
     }
-} // namespace
+} // namespace swift::sample

samples/miscsim/samplesp3d.h

@@ -18,6 +18,6 @@ namespace swift::sample
         //! Run the misc. samples
         static void samplesMisc(QTextStream &streamOut);
     };
-} // namespace
+} // namespace swift::sample
 
 #endif

samples/miscsim/samplesvpilotrules.cpp

@@ -5,16 +5,17 @@
 //! \ingroup samplemiscsim
 
 #include "samplesvpilotrules.h"
-#include "misc/registermetadata.h"
-#include "misc/simulation/fscommon/vpilotmodelruleset.h"
-#include "misc/simulation/fscommon/vpilotrulesreader.h"
-#include "misc/stringutils.h"
 
 #include <QScopedPointer>
 #include <QStringList>
 #include <QTextStream>
 #include <QtGlobal>
 
+#include "misc/registermetadata.h"
+#include "misc/simulation/fscommon/vpilotmodelruleset.h"
+#include "misc/simulation/fscommon/vpilotrulesreader.h"
+#include "misc/stringutils.h"
+
 using namespace swift::misc;
 using namespace swift::misc::simulation;
 using namespace swift::misc::simulation::fscommon;
@@ -37,4 +38,4 @@ namespace swift::sample
         Q_UNUSED(streamIn);
     }
 
-} // namespace
+} // namespace swift::sample

samples/miscsim/samplesvpilotrules.h

@@ -18,6 +18,6 @@ namespace swift::sample
         //! Run the samples
         static void samples(QTextStream &streamOut, const QTextStream &streamIn);
     };
-} // namespace
+} // namespace swift::sample
 
 #endif

samples/miscsim/sampleutils.cpp

@@ -40,4 +40,4 @@ namespace swift::misc
         while (true);
         return selectedDir;
     }
-}
+} // namespace swift::misc

samples/miscsim/sampleutils.h

@@ -23,6 +23,6 @@ namespace swift::misc
     private:
         CSampleUtils() = delete;
     };
-}
+} // namespace swift::misc
 
 #endif // guard