From 5b9d10f85156a41581ea29bbcbc9e5ce2f3e48b5 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 10 Jan 2015 03:56:06 +0100
Subject: [PATCH] Reduce includes in MWGui

---
 apps/openmw/mwgui/birth.hpp               |  5 -----
 apps/openmw/mwgui/class.hpp               |  5 -----
 apps/openmw/mwgui/companionwindow.cpp     |  1 +
 apps/openmw/mwgui/dialogue.hpp            |  5 -----
 apps/openmw/mwgui/enchantingdialog.cpp    |  5 +++++
 apps/openmw/mwgui/hud.hpp                 |  6 +++++-
 apps/openmw/mwgui/journalwindow.hpp       |  1 -
 apps/openmw/mwgui/loadingscreen.cpp       |  1 +
 apps/openmw/mwgui/loadingscreen.hpp       |  7 ++++++-
 apps/openmw/mwgui/merchantrepair.hpp      |  2 --
 apps/openmw/mwgui/messagebox.cpp          |  1 +
 apps/openmw/mwgui/messagebox.hpp          |  2 --
 apps/openmw/mwgui/race.cpp                |  6 ++++++
 apps/openmw/mwgui/race.hpp                | 17 ++++++++++-------
 apps/openmw/mwgui/recharge.hpp            |  5 ++++-
 apps/openmw/mwgui/review.hpp              |  5 -----
 apps/openmw/mwgui/scrollwindow.cpp        |  1 +
 apps/openmw/mwgui/scrollwindow.hpp        |  7 +++++--
 apps/openmw/mwgui/soulgemdialog.cpp       |  1 +
 apps/openmw/mwgui/spellcreationdialog.cpp |  2 ++
 apps/openmw/mwgui/spellcreationdialog.hpp |  7 +++++--
 apps/openmw/mwgui/statswindow.cpp         |  1 +
 apps/openmw/mwgui/statswindow.hpp         |  4 ++--
 apps/openmw/mwgui/waitdialog.cpp          |  2 ++
 apps/openmw/mwgui/waitdialog.hpp          |  6 +++++-
 apps/openmw/mwgui/windowmanagerimp.cpp    |  2 ++
 26 files changed, 65 insertions(+), 42 deletions(-)

diff --git a/apps/openmw/mwgui/birth.hpp b/apps/openmw/mwgui/birth.hpp
index 257dc6fef..0a84bb4e9 100644
--- a/apps/openmw/mwgui/birth.hpp
+++ b/apps/openmw/mwgui/birth.hpp
@@ -3,11 +3,6 @@
 
 #include "windowbase.hpp"
 
-/*
-  This file contains the dialog for choosing a birth sign.
-  Layout is defined by resources/mygui/openmw_chargen_race.layout.
- */
-
 namespace MWGui
 {
     class BirthDialog : public WindowModal
diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp
index 9d529ece0..e36a9a98b 100644
--- a/apps/openmw/mwgui/class.hpp
+++ b/apps/openmw/mwgui/class.hpp
@@ -6,11 +6,6 @@
 #include "widgets.hpp"
 #include "windowbase.hpp"
 
-/*
-  This file contains the dialogs for choosing a class.
-  Layout is defined by resources/mygui/openmw_chargen_class.layout.
- */
-
 namespace MWGui
 {
     class InfoBoxDialog : public WindowModal
diff --git a/apps/openmw/mwgui/companionwindow.cpp b/apps/openmw/mwgui/companionwindow.cpp
index 758316030..53b14691b 100644
--- a/apps/openmw/mwgui/companionwindow.cpp
+++ b/apps/openmw/mwgui/companionwindow.cpp
@@ -4,6 +4,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/dialoguemanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 
diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp
index 4ab88c06f..769c32af7 100644
--- a/apps/openmw/mwgui/dialogue.hpp
+++ b/apps/openmw/mwgui/dialogue.hpp
@@ -18,11 +18,6 @@ namespace MWGui
     class WindowManager;
 }
 
-/*
-  This file contains the dialouge window
-  Layout is defined by resources/mygui/openmw_dialogue_window.layout.
- */
-
 namespace MWGui
 {
     class DialogueHistoryViewModel;
diff --git a/apps/openmw/mwgui/enchantingdialog.cpp b/apps/openmw/mwgui/enchantingdialog.cpp
index a17c0d0e6..3376858c1 100644
--- a/apps/openmw/mwgui/enchantingdialog.cpp
+++ b/apps/openmw/mwgui/enchantingdialog.cpp
@@ -3,7 +3,12 @@
 #include <iomanip>
 
 #include <boost/lexical_cast.hpp>
+
+#include <MyGUI_Button.h>
+#include <MyGUI_ScrollView.h>
+
 #include <components/esm/records.hpp>
+#include <components/widgets/list.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/hud.hpp b/apps/openmw/mwgui/hud.hpp
index ca68d907a..41a535a08 100644
--- a/apps/openmw/mwgui/hud.hpp
+++ b/apps/openmw/mwgui/hud.hpp
@@ -4,7 +4,11 @@
 #include "mapwindow.hpp"
 
 #include "../mwmechanics/stat.hpp"
-#include "../mwworld/ptr.hpp"
+
+namespace MWWorld
+{
+    class Ptr;
+}
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/journalwindow.hpp b/apps/openmw/mwgui/journalwindow.hpp
index 63770ec1a..5d2a5318a 100644
--- a/apps/openmw/mwgui/journalwindow.hpp
+++ b/apps/openmw/mwgui/journalwindow.hpp
@@ -1,7 +1,6 @@
 #ifndef MWGUI_JOURNAL_H
 #define MWGUI_JOURNAL_H
 
-#include <memory>
 #include <boost/shared_ptr.hpp>
 
 namespace MWBase { class WindowManager; }
diff --git a/apps/openmw/mwgui/loadingscreen.cpp b/apps/openmw/mwgui/loadingscreen.cpp
index 855a6fc84..d10a295c1 100644
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@@ -8,6 +8,7 @@
 #include <OgreTextureManager.h>
 #include <OgreViewport.h>
 #include <OgreHardwarePixelBuffer.h>
+#include <OgreSceneManager.h>
 
 #include <MyGUI_RenderManager.h>
 #include <MyGUI_ScrollBar.h>
diff --git a/apps/openmw/mwgui/loadingscreen.hpp b/apps/openmw/mwgui/loadingscreen.hpp
index 892710433..0d3ffbbec 100644
--- a/apps/openmw/mwgui/loadingscreen.hpp
+++ b/apps/openmw/mwgui/loadingscreen.hpp
@@ -1,13 +1,18 @@
 #ifndef MWGUI_LOADINGSCREEN_H
 #define MWGUI_LOADINGSCREEN_H
 
-#include <OgreSceneManager.h>
 #include <OgreTimer.h>
+#include <OgreStringVector.h>
 
 #include "windowbase.hpp"
 
 #include <components/loadinglistener/loadinglistener.hpp>
 
+namespace Ogre
+{
+    class SceneManager;
+}
+
 namespace MWGui
 {
     class BackgroundImage;
diff --git a/apps/openmw/mwgui/merchantrepair.hpp b/apps/openmw/mwgui/merchantrepair.hpp
index 2f1387365..231d11089 100644
--- a/apps/openmw/mwgui/merchantrepair.hpp
+++ b/apps/openmw/mwgui/merchantrepair.hpp
@@ -4,8 +4,6 @@
 #include "windowbase.hpp"
 #include "../mwworld/ptr.hpp"
 
-
-
 namespace MWGui
 {
 
diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp
index 43debd0e5..c45136eb3 100644
--- a/apps/openmw/mwgui/messagebox.cpp
+++ b/apps/openmw/mwgui/messagebox.cpp
@@ -10,6 +10,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/inputmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp
index 5f180df20..59804e097 100644
--- a/apps/openmw/mwgui/messagebox.hpp
+++ b/apps/openmw/mwgui/messagebox.hpp
@@ -3,8 +3,6 @@
 
 #include "windowbase.hpp"
 
-#include "../mwbase/windowmanager.hpp"
-
 #undef MessageBox
 
 namespace MyGUI
diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp
index f6aa8ee4c..b03bf758a 100644
--- a/apps/openmw/mwgui/race.cpp
+++ b/apps/openmw/mwgui/race.cpp
@@ -11,6 +11,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwrender/characterpreview.hpp"
 
 #include "tooltips.hpp"
 
@@ -446,4 +447,9 @@ namespace MWGui
             ++i;
         }
     }
+
+    const ESM::NPC& RaceDialog::getResult() const
+    {
+        return mPreview->getPrototype();
+    }
 }
diff --git a/apps/openmw/mwgui/race.hpp b/apps/openmw/mwgui/race.hpp
index 454c1d0b6..be16af5d1 100644
--- a/apps/openmw/mwgui/race.hpp
+++ b/apps/openmw/mwgui/race.hpp
@@ -1,8 +1,6 @@
 #ifndef MWGUI_RACE_H
 #define MWGUI_RACE_H
 
-#include "../mwrender/characterpreview.hpp"
-
 #include "windowbase.hpp"
 
 
@@ -11,10 +9,15 @@ namespace MWGui
     class WindowManager;
 }
 
-/*
-  This file contains the dialog for choosing a race.
-  Layout is defined by resources/mygui/openmw_chargen_race.layout.
- */
+namespace MWRender
+{
+    class RaceSelectionPreview;
+}
+
+namespace ESM
+{
+    struct NPC;
+}
 
 namespace MWGui
 {
@@ -29,7 +32,7 @@ namespace MWGui
             GM_Female
         };
 
-        const ESM::NPC &getResult() const { return mPreview->getPrototype(); }
+        const ESM::NPC &getResult() const;
         const std::string &getRaceId() const { return mCurrentRaceId; }
         Gender getGender() const { return mGenderIndex == 0 ? GM_Male : GM_Female; }
         // getFace()
diff --git a/apps/openmw/mwgui/recharge.hpp b/apps/openmw/mwgui/recharge.hpp
index 17d700649..3e8e1269e 100644
--- a/apps/openmw/mwgui/recharge.hpp
+++ b/apps/openmw/mwgui/recharge.hpp
@@ -3,7 +3,10 @@
 
 #include "windowbase.hpp"
 
-#include "../mwworld/ptr.hpp"
+namespace MWWorld
+{
+    class Ptr;
+}
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp
index 1419925b5..111d7de1d 100644
--- a/apps/openmw/mwgui/review.hpp
+++ b/apps/openmw/mwgui/review.hpp
@@ -11,11 +11,6 @@ namespace MWGui
     class WindowManager;
 }
 
-/*
-This file contains the dialog for reviewing the generated character.
-Layout is defined by resources/mygui/openmw_chargen_review.layout.
-*/
-
 namespace MWGui
 {
     class ReviewDialog : public WindowModal
diff --git a/apps/openmw/mwgui/scrollwindow.cpp b/apps/openmw/mwgui/scrollwindow.cpp
index d49d5ad5f..d61693d39 100644
--- a/apps/openmw/mwgui/scrollwindow.cpp
+++ b/apps/openmw/mwgui/scrollwindow.cpp
@@ -3,6 +3,7 @@
 #include <MyGUI_ScrollView.h>
 
 #include <components/esm/loadbook.hpp>
+#include <components/widgets/imagebutton.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/scrollwindow.hpp b/apps/openmw/mwgui/scrollwindow.hpp
index 08ce6a905..e1f86529a 100644
--- a/apps/openmw/mwgui/scrollwindow.hpp
+++ b/apps/openmw/mwgui/scrollwindow.hpp
@@ -3,10 +3,13 @@
 
 #include "windowbase.hpp"
 
-#include <components/widgets/imagebutton.hpp>
-
 #include "../mwworld/ptr.hpp"
 
+namespace Gui
+{
+    class ImageButton;
+}
+
 namespace MWGui
 {
     class ScrollWindow : public WindowBase
diff --git a/apps/openmw/mwgui/soulgemdialog.cpp b/apps/openmw/mwgui/soulgemdialog.cpp
index 6d70c85d9..0232eb7b3 100644
--- a/apps/openmw/mwgui/soulgemdialog.cpp
+++ b/apps/openmw/mwgui/soulgemdialog.cpp
@@ -1,6 +1,7 @@
 #include "soulgemdialog.hpp"
 
 #include "../mwbase/environment.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "messagebox.hpp"
 
diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp
index 1ff379c0b..a00afdab8 100644
--- a/apps/openmw/mwgui/spellcreationdialog.cpp
+++ b/apps/openmw/mwgui/spellcreationdialog.cpp
@@ -5,6 +5,7 @@
 
 #include <components/misc/resourcehelpers.hpp>
 #include <components/esm/records.hpp>
+#include <components/widgets/list.hpp>
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
@@ -22,6 +23,7 @@
 
 #include "tooltips.hpp"
 #include "class.hpp"
+#include "widgets.hpp"
 
 namespace
 {
diff --git a/apps/openmw/mwgui/spellcreationdialog.hpp b/apps/openmw/mwgui/spellcreationdialog.hpp
index 72e581c87..6cdf74d10 100644
--- a/apps/openmw/mwgui/spellcreationdialog.hpp
+++ b/apps/openmw/mwgui/spellcreationdialog.hpp
@@ -3,11 +3,14 @@
 
 #include <components/esm/loadmgef.hpp>
 #include <components/esm/loadspel.hpp>
-#include <components/widgets/list.hpp>
 
 #include "windowbase.hpp"
 #include "referenceinterface.hpp"
-#include "widgets.hpp"
+
+namespace Gui
+{
+    class MWList;
+}
 
 namespace MWGui
 {
diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp
index b5abf91fd..19f9c749c 100644
--- a/apps/openmw/mwgui/statswindow.cpp
+++ b/apps/openmw/mwgui/statswindow.cpp
@@ -12,6 +12,7 @@
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 
diff --git a/apps/openmw/mwgui/statswindow.hpp b/apps/openmw/mwgui/statswindow.hpp
index f41995ac0..2cf4ca819 100644
--- a/apps/openmw/mwgui/statswindow.hpp
+++ b/apps/openmw/mwgui/statswindow.hpp
@@ -1,11 +1,11 @@
 #ifndef MWGUI_STATS_WINDOW_H
 #define MWGUI_STATS_WINDOW_H
 
-#include "../mwworld/esmstore.hpp"
-
 #include "../mwmechanics/stat.hpp"
 #include "windowpinnablebase.hpp"
 
+#include <components/esm/loadskil.hpp>
+
 namespace MWGui
 {
     class WindowManager;
diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp
index c53a887c9..718e04e52 100644
--- a/apps/openmw/mwgui/waitdialog.cpp
+++ b/apps/openmw/mwgui/waitdialog.cpp
@@ -19,6 +19,8 @@
 
 #include "../mwstate/charactermanager.hpp"
 
+#include "widgets.hpp"
+
 namespace MWGui
 {
 
diff --git a/apps/openmw/mwgui/waitdialog.hpp b/apps/openmw/mwgui/waitdialog.hpp
index 1cf05bb06..435c1cb54 100644
--- a/apps/openmw/mwgui/waitdialog.hpp
+++ b/apps/openmw/mwgui/waitdialog.hpp
@@ -2,11 +2,15 @@
 #define MWGUI_WAIT_DIALOG_H
 
 #include "windowbase.hpp"
-#include "widgets.hpp"
 
 namespace MWGui
 {
 
+    namespace Widgets
+    {
+        class MWScrollBar;
+    }
+
     class WaitDialogProgressBar : public WindowBase
     {
     public:
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index aa80e69fc..5d737ec41 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -5,6 +5,7 @@
 
 #include <OgreTextureManager.h>
 #include <OgreRenderWindow.h>
+#include <OgreSceneManager.h>
 
 #include <MyGUI_UString.h>
 #include <MyGUI_IPointer.h>
@@ -34,6 +35,7 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/npcstats.hpp"