Views guard name and style

src/blackgui/views/aircrafticaoview.cpp

@@ -7,7 +7,6 @@
  * contained in the LICENSE file.
  */
 
-#include "blackgui/models/aircrafticaolistmodel.h"
 #include "blackgui/views/aircrafticaoview.h"
 #include "blackgui/views/viewbase.h"
 

src/blackgui/views/aircrafticaoview.h

@@ -9,23 +9,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_AIRCRAFTICAOVIEW_H
+#ifndef BLACKGUI_VIEWS_AIRCRAFTICAOVIEW_H
-#define BLACKGUI_AIRCRAFTICAOVIEW_H
+#define BLACKGUI_VIEWS_AIRCRAFTICAOVIEW_H
 
-#include "blackgui/blackguiexport.h"
 #include "blackgui/models/aircrafticaolistmodel.h"
 #include "blackgui/views/viewdbobjects.h"
-
+#include "blackgui/blackguiexport.h"
-class QWidget;
-
-namespace BlackMisc
-{
-    namespace Aviation
-    {
-        class CAircraftIcaoCode;
-        class CAircraftIcaoCodeList;
-    }
-}
 
 namespace BlackGui
 {

src/blackgui/views/aircraftpartsview.h

@@ -15,9 +15,6 @@
 #include "blackgui/views/viewtimestampobjects.h"
 #include "blackgui/models/aircraftpartslistmodel.h"
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/aviation/aircraftpartslist.h"
-
-class QWidget;
 
 namespace BlackGui
 {

src/blackgui/views/aircraftsituationview.h

@@ -15,9 +15,6 @@
 #include "blackgui/views/viewtimestampobjects.h"
 #include "blackgui/models/aircraftsituationlistmodel.h"
 #include "blackgui/blackguiexport.h"
-#include "blackmisc/aviation/aircraftsituationlist.h"
-
-class QWidget;
 
 namespace BlackGui
 {

src/blackgui/views/airportview.h

@@ -9,17 +9,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_AIRPORTVIEW_H
+#ifndef BLACKGUI_VIEWS_AIRPORTVIEW_H
-#define BLACKGUI_AIRPORTVIEW_H
+#define BLACKGUI_VIEWS_AIRPORTVIEW_H
 
 #include "blackgui/blackguiexport.h"
 #include "blackgui/models/airportlistmodel.h"
 #include "blackgui/views/viewbase.h"
-#include "blackmisc/aviation/airportlist.h"
-
-class QWidget;
-
-namespace BlackMisc { namespace Aviation { class CAirport; } }
 
 namespace BlackGui
 {

src/blackgui/views/atcstationtreeview.h

@@ -9,8 +9,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_ATCSTATIONTREEVIEW_H
+#ifndef BLACKGUI_VIEWS_ATCSTATIONTREEVIEW_H
-#define BLACKGUI_ATCSTATIONTREEVIEW_H
+#define BLACKGUI_VIEWS_ATCSTATIONTREEVIEW_H
 
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/aviation/atcstationlist.h"

src/blackgui/views/clientview.h

@@ -9,18 +9,15 @@
 
 //! \file
 
-#ifndef BLACKGUI_CLIENTVIEW_H
+#ifndef BLACKGUI_VIEWS_CLIENTVIEW_H
-#define BLACKGUI_CLIENTVIEW_H
+#define BLACKGUI_VIEWS_CLIENTVIEW_H
 
 #include "blackgui/blackguiexport.h"
 #include "blackgui/models/clientlistmodel.h"
 #include "blackgui/views/viewbase.h"
 #include "blackmisc/network/clientlist.h"
 
-class QWidget;
-
 namespace BlackMisc { namespace Network { class CClient; } }
-
 namespace BlackGui
 {
     namespace Views

src/blackgui/views/countryview.h

@@ -17,8 +17,6 @@
 #include "blackgui/blackguiexport.h"
 #include "blackmisc/countrylist.h"
 
-class QWidget;
-
 namespace BlackGui
 {
     namespace Views

src/blackgui/views/distributorview.h

@@ -9,8 +9,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_DISTRIBUTORVIEW_H
+#ifndef BLACKGUI_VIEWS_DISTRIBUTORVIEW_H
-#define BLACKGUI_DISTRIBUTORVIEW_H
+#define BLACKGUI_VIEWS_DISTRIBUTORVIEW_H
 
 #include "blackgui/blackguiexport.h"
 #include "blackgui/models/distributorlistmodel.h"

src/blackgui/views/liveryview.h

@@ -9,23 +9,12 @@
 
 //! \file
 
-#ifndef BLACKGUI_LIVERYVIEW_H
+#ifndef BLACKGUI_VIEWS_LIVERYVIEW_H
-#define BLACKGUI_LIVERYVIEW_H
+#define BLACKGUI_VIEWS_LIVERYVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/liverylistmodel.h"
 #include "blackgui/views/viewdbobjects.h"
-
+#include "blackgui/models/liverylistmodel.h"
-class QWidget;
+#include "blackgui/blackguiexport.h"
-
-namespace BlackMisc
-{
-    namespace Aviation
-    {
-        class CLivery;
-        class CLiveryList;
-    }
-}
 
 namespace BlackGui
 {

src/blackgui/views/statusmessageview.h

@@ -9,14 +9,14 @@
 
 //! \file
 
-#ifndef BLACKGUI_STATUSMESSAGEVIEW_H
+#ifndef BLACKGUI_VIEWS_STATUSMESSAGEVIEW_H
-#define BLACKGUI_STATUSMESSAGEVIEW_H
+#define BLACKGUI_VIEWS_STATUSMESSAGEVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/statusmessagelistmodel.h"
 #include "blackgui/views/viewbase.h"
-#include "blackmisc/statusmessage.h"
+#include "blackgui/models/statusmessagelistmodel.h"
 #include "blackmisc/statusmessagelist.h"
+#include "blackmisc/statusmessage.h"
+#include "blackgui/blackguiexport.h"
 
 #include <QObject>
 

src/blackgui/views/temperaturelayerview.h

@@ -9,17 +9,14 @@
 
 //! \file
 
-#ifndef BLACKGUI_TEMPERATURELAYERVIEW_H
+#ifndef BLACKGUI_VIEWS_TEMPERATURELAYERVIEW_H
-#define BLACKGUI_TEMPERATURELAYERVIEW_H
+#define BLACKGUI_VIEWS_TEMPERATURELAYERVIEW_H
 
 #include "blackgui/blackguiexport.h"
 #include "blackgui/models/temperaturelayerlistmodel.h"
 #include "blackgui/views/viewbase.h"
 
-class QWidget;
-
 namespace BlackMisc { namespace Weather { class CTemperatureLayer; } }
-
 namespace BlackGui
 {
     namespace Views

src/blackgui/views/textmessageview.h

@@ -12,12 +12,10 @@
 #ifndef BLACKGUI_TEXTMESSAGEVIEW_H
 #define BLACKGUI_TEXTMESSAGEVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/textmessagelistmodel.h"
 #include "blackgui/views/viewbase.h"
+#include "blackgui/models/textmessagelistmodel.h"
 #include "blackmisc/network/textmessagelist.h"
-
+#include "blackgui/blackguiexport.h"
-class QWidget;
 
 namespace BlackMisc { namespace Network { class CTextMessage; } }
 namespace BlackGui

src/blackgui/views/userview.h

@@ -12,9 +12,9 @@
 #ifndef BLACKGUI_USERVIEW_H
 #define BLACKGUI_USERVIEW_H
 
-#include "blackgui/blackguiexport.h"
-#include "blackgui/models/userlistmodel.h"
 #include "blackgui/views/viewbase.h"
+#include "blackgui/models/userlistmodel.h"
+#include "blackgui/blackguiexport.h"
 #include "blackmisc/network/userlist.h"
 
 namespace BlackMisc { namespace Network { class CUser; } }
@@ -47,6 +47,6 @@ namespace BlackGui
             void requestTextMessage();
         };
     }
-}
+} // ns
 
 #endif // guard

src/blackgui/views/viewbaseitemdelegate.h

@@ -9,8 +9,8 @@
 
 //! \file
 
-#ifndef BLACKGUI_VIEWBASE_ITEMDELEGATE_H
+#ifndef BLACKGUI_VIEWS_ITEMDELEGATE_H
-#define BLACKGUI_VIEWBASE_ITEMDELEGATE_H
+#define BLACKGUI_VIEWS_ITEMDELEGATE_H
 
 #include <QStyledItemDelegate>
 
@@ -43,4 +43,5 @@ namespace BlackGui
         };
     } // namespace
 } // namespace
+
 #endif // guard