Fix BlackGui header includes

* Include only what is used
* Use forward declaration when possible
* Sorted includes

refs #598

src/blackgui/menus/aircraftmodelmenus.cpp

@@ -12,7 +12,9 @@
 #include "blackcore/webdataservices.h"
 #include "blackmisc/icons.h"
 #include "blackmisc/logmessage.h"
+#include "blackmisc/simulation/aircraftmodelinterfaces.h"
 #include "blackmisc/simulation/aircraftmodelutils.h"
+
 #include <QDesktopServices>
 
 using namespace BlackMisc;

src/blackgui/menus/aircraftmodelmenus.h

@@ -10,14 +10,24 @@
 #ifndef BLACKGUI_MENUS_AIRCRAFTMODELMENUS_H
 #define BLACKGUI_MENUS_AIRCRAFTMODELMENUS_H
 
-#include "menudelegate.h"
-#include "blackgui/views/aircraftmodelview.h"
+#include "blackgui/menus/menudelegate.h"
 #include "blackgui/overlaymessagesframe.h"
-#include "blackmisc/simulation/aircraftmodelinterfaces.h"
-#include "blackmisc/simulation/fscommon/vpilotrulesreader.h"
+#include "blackgui/views/aircraftmodelview.h"
+
 #include <QMenu>
 #include <QObject>
 
+class QAction;
+
+namespace BlackMisc
+{
+    namespace Simulation
+    {
+        class IModelsSetable;
+        class IModelsUpdatable;
+    }
+}
+
 namespace BlackGui
 {
     namespace Menus

src/blackgui/menus/menuaction.cpp

@@ -7,9 +7,16 @@
  * contained in the LICENSE file.
  */
 
-#include "menuaction.h"
+#include "blackgui/menus/menuaction.h"
 #include "blackmisc/icons.h"
+#include "blackmisc/slot.h"
 #include "blackmisc/verify.h"
+
+#include <QAction>
+#include <QMap>
+#include <QMenu>
+#include <QStringList>
+#include <QtGlobal>
 #include <algorithm>
 
 using namespace BlackMisc;

src/blackgui/menus/menuaction.h

@@ -11,10 +11,17 @@
 #define BLACKGUI_MENUS_MENUACTION_H
 
 #include "blackmisc/slot.h"
-#include <QMenu>
-#include <QAction>
+
 #include <QIcon>
+#include <QKeySequence>
+#include <QList>
+#include <QMap>
 #include <QMultiMap>
+#include <QString>
+
+class QAction;
+class QMenu;
+class QObject;
 
 namespace BlackGui
 {

src/blackgui/menus/menudelegate.h

@@ -12,9 +12,11 @@
 
 #include "blackmisc/logcategorylist.h"
 #include "blackgui/menus/menuaction.h"
+
+#include <QMenu>
 #include <QObject>
 
-using namespace BlackMisc;
+class QWidget;
 
 namespace BlackGui
 {
@@ -41,9 +43,9 @@ namespace BlackGui
             virtual ~IMenuDelegate() {}
 
             //! Log categories
-            const CLogCategoryList &getLogCategories()
+            const BlackMisc::CLogCategoryList &getLogCategories()
             {
-                static const CLogCategoryList cats({CLogCategory::guiComponent()});
+                static const BlackMisc::CLogCategoryList cats({BlackMisc::CLogCategory::guiComponent()});
                 return cats;
             }