Style

src/blackcore/aircraftmatcher.h

@@ -25,16 +25,8 @@ namespace BlackMisc
 {
     class CLogCategoryList;
     class CStatusMessageList;
-
-    namespace Aviation
-    {
-        class CCallsign;
-    }
-
-    namespace Simulation
-    {
-        class CSimulatedAircraft;
-    }
+    namespace Aviation { class CCallsign; }
+    namespace Simulation { class CSimulatedAircraft; }
 }
 
 namespace BlackCore

src/blackcore/audiodevice.h

@@ -15,9 +15,9 @@
 #include "blackcoreexport.h"
 #include "blackmisc/audio/audiodeviceinfo.h"
 #include "blackmisc/audio/audiodeviceinfolist.h"
-#include <QObject>
 
 //! \file
+#include <QObject>
 
 namespace BlackCore
 {

src/blackcore/context.h

@@ -24,10 +24,7 @@
 #include <QString>
 #include <QtGlobal>
 
-namespace BlackMisc
-{
-    class CLogCategoryList;
-}
+namespace BlackMisc { class CLogCategoryList; }
 
 namespace BlackCore
 {

src/blackcore/contextapplication.h

@@ -36,10 +36,7 @@
 
 class QDBusConnection;
 
-namespace BlackMisc
-{
-    class CDBusServer;
-}
+namespace BlackMisc { class CDBusServer; }
 
 //! \addtogroup dbus
 //! @{

src/blackcore/contextaudio.h

@@ -34,16 +34,8 @@ class QDBusConnection;
 namespace BlackMisc
 {
     class CDBusServer;
-
-    namespace Audio
-    {
-        class CAudioDeviceInfo;
-    }
-
-    namespace Aviation
-    {
-        class CCallsign;
-    }
+    namespace Audio { class CAudioDeviceInfo; }
+    namespace Aviation { class CCallsign; }
 }
 
 //! \addtogroup dbus

src/blackcore/contextaudioproxy.h

@@ -33,16 +33,8 @@ class QDBusConnection;
 namespace BlackMisc
 {
     class CGenericDBusInterface;
-
-    namespace Audio
-    {
-        class CAudioDeviceInfo;
-    }
-
-    namespace Aviation
-    {
-        class CCallsign;
-    }
+    namespace Audio { class CAudioDeviceInfo; }
+    namespace Aviation { class CCallsign; }
 }
 
 namespace BlackCore

src/blackcore/contextnetwork.h

@@ -43,22 +43,13 @@ class QDBusConnection;
 namespace BlackMisc
 {
     class CDBusServer;
-
     namespace Aviation
     {
         class CAircraftParts;
         class CCallsign;
     }
-
-    namespace Network
-    {
-        class CTextMessage;
-    }
-
-    namespace Simulation
-    {
-        class CAircraftModel;
-    }
+    namespace Network { class CTextMessage; }
+    namespace Simulation { class CAircraftModel; }
 }
 
 //! \addtogroup dbus

src/blackcore/contextnetworkimpl.h

@@ -54,7 +54,6 @@ class QTimer;
 namespace BlackMisc
 {
     class CDBusServer;
-
     namespace Aviation
     {
         class CAircraftParts;

src/blackcore/contextnetworkproxy.h

@@ -44,16 +44,12 @@ class QDBusConnection;
 namespace BlackMisc
 {
     class CGenericDBusInterface;
-
     namespace Aviation
     {
         class CAircraftParts;
         class CCallsign;
     }
-    namespace Simulation
-    {
-        class CAircraftModel;
-    }
+    namespace Simulation { class CAircraftModel; }
 }
 
 namespace BlackCore

src/blackcore/contextownaircraft.h

@@ -33,7 +33,6 @@ class QDBusConnection;
 namespace BlackMisc
 {
     class CDBusServer;
-
     namespace Aviation
     {
         class CAircraftIcaoCode;

src/blackcore/contextownaircraftimpl.h

@@ -39,7 +39,6 @@
 namespace BlackMisc
 {
     class CDBusServer;
-
     namespace Aviation
     {
         class CAircraftIcaoCode;

src/blackcore/contextownaircraftproxy.h

@@ -32,7 +32,6 @@ class QDBusConnection;
 namespace BlackMisc
 {
     class CGenericDBusInterface;
-
     namespace Aviation
     {
         class CAircraftIcaoCode;

src/blackcore/contextsimulator.h

@@ -46,11 +46,7 @@ class QDBusConnection;
 namespace BlackMisc
 {
     class CDBusServer;
-
-    namespace Simulation
-    {
-        class CSimulatedAircraft;
-    }
+    namespace Simulation { class CSimulatedAircraft; }
 }
 
 namespace BlackCore

src/blackcore/contextsimulatorimpl.h

@@ -38,16 +38,8 @@
 namespace BlackMisc
 {
     class CDBusServer;
-
-    namespace Aviation
-    {
-        class CCallsign;
-    }
-
-    namespace Simulation
-    {
-        class CSimulatedAircraft;
-    }
+    namespace Aviation { class CCallsign; }
+    namespace Simulation { class CSimulatedAircraft; }
 }
 
 namespace BlackCore

src/blackcore/contextsimulatorproxy.h

@@ -32,11 +32,7 @@ class QDBusConnection;
 namespace BlackMisc
 {
     class CGenericDBusInterface;
-
-    namespace Simulation
-    {
-        class CSimulatedAircraft;
-    }
+    namespace Simulation { class CSimulatedAircraft; }
 }
 
 namespace BlackCore

src/blackcore/corefacade.h

@@ -22,10 +22,7 @@
 #include <QObject>
 #include <QString>
 
-namespace BlackMisc
-{
-    class CDBusServer;
-}
+namespace BlackMisc { class CDBusServer; }
 
 namespace BlackCore
 {

src/blackcore/databaseauthentication.h

@@ -22,13 +22,7 @@
 
 class QNetworkReply;
 
-namespace BlackMisc
-{
-    namespace Network
-    {
-        class CAuthenticatedUser;
-    }
-}
+namespace BlackMisc { namespace Network { class CAuthenticatedUser; } }
 
 namespace BlackCore
 {

src/blackcore/databasereader.h

@@ -28,10 +28,7 @@
 
 class QNetworkReply;
 
-namespace BlackMisc
-{
-    class CLogCategoryList;
-}
+namespace BlackMisc { class CLogCategoryList; }
 
 namespace BlackCore
 {

src/blackcore/interpolator.h

@@ -21,13 +21,7 @@
 #include <QString>
 #include <QtGlobal>
 
-namespace BlackMisc
-{
-    namespace Aviation
-    {
-        class CCallsign;
-    }
-}
+namespace BlackMisc { namespace Aviation { class CCallsign; } }
 
 namespace BlackCore
 {

src/blackcore/interpolatorlinear.h

@@ -23,15 +23,8 @@ class QObject;
 
 namespace BlackMisc
 {
-    namespace Aviation
-    {
-        class CCallsign;
-    }
-
-    namespace Simulation
-    {
-        class IRemoteAircraftProvider;
-    }
+    namespace Aviation { class CCallsign; }
+    namespace Simulation { class IRemoteAircraftProvider; }
 }
 
 namespace BlackCore

src/blackcore/networkvatlib.h

@@ -45,14 +45,8 @@ class QTextCodec;
 
 namespace BlackMisc
 {
-    namespace Aviation
-    {
-        class CFlightPlan;
-    }
-    namespace Simulation
-    {
-        class CSimulatedAircraft;
-    }
+    namespace Aviation { class CFlightPlan; }
+    namespace Simulation { class CSimulatedAircraft; }
 }
 
 namespace BlackCore

src/blackcore/pluginmanagerweatherdata.h

@@ -23,10 +23,7 @@
 #include <QObject>
 #include <QString>
 
-namespace BlackMisc
-{
-    class CVariant;
-}
+namespace BlackMisc { class CVariant; }
 
 namespace BlackCore
 {

src/blackcore/setupreader.h

@@ -29,10 +29,7 @@
 
 class QNetworkReply;
 
-namespace BlackMisc
-{
-    class CLogCategoryList;
-}
+namespace BlackMisc { class CLogCategoryList; }
 
 namespace BlackCore
 {

src/blackcore/simulator.h

@@ -32,27 +32,15 @@
 namespace BlackMisc
 {
     class IPluginStorageProvider;
-
-    namespace Aviation
-    {
-        class CCallsign;
-    }
-
-    namespace Network
-    {
-        class CTextMessage;
-    }
-
+    namespace Aviation { class CCallsign; }
+    namespace Network { class CTextMessage; }
     namespace Simulation
     {
         class CSimulatorSetup;
         class IOwnAircraftProvider;
         class IRemoteAircraftProvider;
     }
-    namespace Weather
-    {
-        class IWeatherGridProvider;
-    }
+    namespace Weather { class IWeatherGridProvider; }
 }
 
 namespace BlackCore

src/blackcore/simulatorcommon.h

@@ -42,7 +42,6 @@ namespace BlackMisc
         class CAircraftSituation;
         class CCallsign;
     }
-
     namespace Simulation
     {
         class CAirspaceAircraftSnapshot;

src/blackcore/vatsimdatafilereader.h

@@ -34,13 +34,7 @@
 
 class QNetworkReply;
 
-namespace BlackMisc
-{
-    namespace Simulation
-    {
-        class CSimulatedAircraft;
-    }
-}
+namespace BlackMisc { namespace Simulation { class CSimulatedAircraft; } }
 
 namespace BlackCore
 {

src/blackcore/weathermanager.h

@@ -21,11 +21,6 @@
 #include <QObject>
 #include <QVector>
 
-namespace BlackMisc
-{
-    template <typename F> class CSlot;
-}
-
 namespace BlackCore
 {
     class IWeatherData;

src/blackcore/webdataservices.h

@@ -47,18 +47,8 @@
 namespace BlackMisc
 {
     class CLogCategoryList;
-
-    namespace Aviation
-    {
-        class CCallsign;
-    }
-
-    namespace Simulation
-    {
-        class CSimulatedAircraft;
-    }
-
-    template <typename T> class Restricted;
+    namespace Aviation { class CCallsign; }
+    namespace Simulation { class CSimulatedAircraft; }
 }
 
 namespace BlackCore

src/blackgui/pluginconfig.h

@@ -14,6 +14,8 @@
 
 #include "blackgui/blackguiexport.h"
 
+#include <QtPlugin>
+
 class QWidget;
 
 namespace BlackGui

src/blackmisc/aviation/adfsystem.h

@@ -14,6 +14,7 @@
 
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/aviation/modulator.h"
+
 #include <stdexcept>
 
 namespace BlackMisc

src/blackmisc/aviation/aircraftpartslist.h

@@ -12,7 +12,7 @@
 #ifndef BLACKMISC_AVIATION_AIRCRAFTPARTSLIST_H
 #define BLACKMISC_AVIATION_AIRCRAFTPARTSLIST_H
 
-#include "aircraftparts.h"
+#include "blackmisc/aviation/aircraftparts.h"
 #include "blackmisc/blackmiscexport.h"
 #include "blackmisc/collection.h"
 #include "blackmisc/sequence.h"

src/blackmisc/aviation/selcal.h

@@ -25,14 +25,8 @@ class QStringList;
 
 namespace BlackMisc
 {
-    namespace PhysicalQuantities
-    {
-        class CFrequency;
-    }
-}
+    namespace PhysicalQuantities { class CFrequency; }
 
-namespace BlackMisc
-{
     namespace Aviation
     {
         /*!

src/blackmisc/datastoreutility.h

@@ -21,10 +21,7 @@ namespace BlackMisc
 {
     class CStatusMessageList;
 
-    namespace Simulation
-    {
-        class CAircraftModelList;
-    }
+    namespace Simulation { class CAircraftModelList; }
 
     /*!
      * Class with datastore related utilities

src/blackmisc/icon.h

@@ -31,10 +31,7 @@
 namespace BlackMisc
 {
     class CIcon;
-    namespace PhysicalQuantities
-    {
-        class CAngle;
-    }
+    namespace PhysicalQuantities { class CAngle; }
 
     namespace Mixin
     {

src/blackmisc/icons.h

@@ -16,13 +16,13 @@
 
 #include <QIcon>
 #include <QImage>
+#include <QMap>
 #include <QMetaType>
 #include <QPixmap>
 #include <QString>
 #include <Qt>
 
 class QSize;
-template <class Key, class T> class QMap;
 
 namespace BlackMisc
 {

src/blackmisc/math/mathutils.h

@@ -13,6 +13,7 @@
 #define BLACKMISC_MATH_MATHUTILS_H
 
 #include "blackmisc/blackmiscexport.h"
+
 #include <QtCore/qmath.h>
 #include <cmath>
 

src/blackmisc/predicates.h

@@ -15,6 +15,7 @@
 #define BLACKMISC_PREDICATES_H
 
 #include "integersequence.h"
+
 #include <QObject>
 #include <functional>
 #include <algorithm>

src/blackmisc/simulation/fscommon/bcdconversions.h

@@ -19,10 +19,7 @@
 
 namespace BlackMisc
 {
-    namespace Aviation
-    {
-        class CTransponder;
-    }
+    namespace Aviation { class CTransponder; }
 
     namespace Simulation
     {

src/blackmisc/simulation/xplane/xplaneutil.h

@@ -13,6 +13,7 @@
 #define BLACKMISC_SIMULATION_XPLANE_XPLANEUTIL_H
 
 #include "blackmisc/blackmiscexport.h"
+
 #include <QString>
 
 namespace BlackMisc

src/blackmisc/statusmessage.h

@@ -18,6 +18,7 @@
 #include "logcategorylist.h"
 #include "timestampbased.h"
 #include "typetraits.h"
+
 #include <QReadWriteLock>
 
 namespace BlackMisc

src/blackmisc/valuecache.h

@@ -47,10 +47,6 @@
 namespace BlackMisc
 {
     class CLogCategoryList;
-}
-
-namespace BlackMisc
-{
 
     /*!
      * Value class used for signalling changed values in the cache.

src/blackmisc/valueobject.h

@@ -22,6 +22,7 @@
 #include "iconlist.h"
 #include "dictionary.h"
 #include "stringutils.h"
+
 #include <QtDBus/QDBusMetaType>
 #include <QString>
 #include <QtGlobal>

src/blackmisc/weather/cloudlayerlist.h

@@ -23,10 +23,7 @@
 
 namespace BlackMisc
 {
-    namespace Aviation
-    {
-        class CAltitude;
-    }
+    namespace Aviation { class CAltitude; }
 
     namespace Weather
     {

src/blackmisc/weather/temperaturelayerlist.h

@@ -24,10 +24,7 @@
 
 namespace BlackMisc
 {
-    namespace Aviation
-    {
-        class CAltitude;
-    }
+    namespace Aviation { class CAltitude; }
 
     namespace Weather
     {

src/blackmisc/weather/visibilitylayerlist.h

@@ -23,10 +23,7 @@
 
 namespace BlackMisc
 {
-    namespace Aviation
-    {
-        class CAltitude;
-    }
+    namespace Aviation { class CAltitude; }
 
     namespace Weather
     {

src/blackmisc/weather/weathergrid.h

@@ -23,10 +23,7 @@
 
 namespace BlackMisc
 {
-    namespace Geo
-    {
-        class ICoordinateGeodetic;
-    }
+    namespace Geo { class ICoordinateGeodetic; }
 
     namespace Weather
     {

src/blackmisc/weather/windlayerlist.h

@@ -23,10 +23,7 @@
 
 namespace BlackMisc
 {
-    namespace Aviation
-    {
-        class CAltitude;
-    }
+    namespace Aviation { class CAltitude; }
 
     namespace Weather
     {