Merge remote-tracking branch 'galdor557/master'

apps/openmw/mwgui/alchemywindow.cpp

@@ -8,8 +8,6 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/player.hpp"
-#include "../mwworld/manualref.hpp"
-#include "../mwworld/containerstore.hpp"
 
 namespace
 {

apps/openmw/mwgui/alchemywindow.hpp

@@ -10,7 +10,6 @@
 
 namespace MWGui
 {
-
     class AlchemyWindow : public WindowBase, public ContainerBase
     {
     public:

apps/openmw/mwgui/birth.cpp

@@ -3,8 +3,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "../mwworld/esmstore.hpp"
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwgui/charactercreation.cpp

@@ -5,8 +5,6 @@
 #include "class.hpp"
 #include "birth.hpp"
 #include "review.hpp"
-#include "dialogue.hpp"
-#include "mode.hpp"
 #include "inventorywindow.hpp"
 #include <boost/lexical_cast.hpp>
 #include "../mwbase/environment.hpp"

apps/openmw/mwgui/class.cpp

@@ -1,11 +1,6 @@
 #include "class.hpp"
 
-#include <iterator>
-
 #include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
-
-#include "../mwworld/esmstore.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

apps/openmw/mwgui/companionwindow.cpp

@@ -2,7 +2,6 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/dialoguemanager.hpp"
 

apps/openmw/mwgui/confirmationdialog.cpp

@@ -1,10 +1,5 @@
 #include "confirmationdialog.hpp"
 
-#include <boost/lexical_cast.hpp>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
 namespace MWGui
 {
     ConfirmationDialog::ConfirmationDialog() :

apps/openmw/mwgui/console.cpp

@@ -1,13 +1,7 @@
-
 #include "console.hpp"
 
-#include <algorithm>
-#include <fstream>
-
 #include <components/compiler/exception.hpp>
 
-#include "../mwworld/esmstore.hpp"
-
 #include "../mwscript/extensions.hpp"
 
 #include "../mwbase/environment.hpp"

apps/openmw/mwgui/container.cpp

@@ -1,11 +1,5 @@
 #include "container.hpp"
 
-#include <cmath>
-#include <algorithm>
-#include <iterator>
-#include <cassert>
-#include <iostream>
-
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -13,15 +7,9 @@
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwworld/manualref.hpp"
-#include "../mwworld/containerstore.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
 
-#include "../mwclass/container.hpp"
-
-#include "widgets.hpp"
 #include "countdialog.hpp"
 #include "tradewindow.hpp"
 #include "inventorywindow.hpp"

apps/openmw/mwgui/countdialog.cpp

@@ -2,9 +2,6 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
 namespace MWGui
 {
     CountDialog::CountDialog() :

apps/openmw/mwgui/cursor.cpp

@@ -2,13 +2,11 @@
 
 #include <MyGUI_PointerManager.h>
 #include <MyGUI_InputManager.h>
-#include <MyGUI_RenderManager.h>
 #include <MyGUI_RotatingSkin.h>
 #include <MyGUI_Gui.h>
 
 #include <OgreMath.h>
 
-
 namespace MWGui
 {
 

apps/openmw/mwgui/dialogue.cpp

@@ -1,18 +1,11 @@
 #include "dialogue.hpp"
 
-#include <iostream>
-#include <iterator>
-
-#include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "../mwworld/esmstore.hpp"
-
 #include "../mwbase/environment.hpp"
-#include "../mwbase/dialoguemanager.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/world.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 

apps/openmw/mwgui/formatting.cpp

@@ -3,7 +3,6 @@
 #include <components/interpreter/defines.hpp>
 
 #include "../mwscript/interpretercontext.hpp"
-#include "../mwworld/ptr.hpp"
 
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/predicate.hpp>

apps/openmw/mwgui/hud.cpp

@@ -1,24 +1,14 @@
 #include "hud.hpp"
 
-#include <cmath>
-
-#include <MyGUI_Widget.h>
-#include <MyGUI_RenderManager.h>
-
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
 
-#include "../mwgui/widgets.hpp"
-
 #include "inventorywindow.hpp"
-#include "container.hpp"
 #include "console.hpp"
 #include "spellicons.hpp"
 

apps/openmw/mwgui/inventorywindow.cpp

@@ -1,28 +1,15 @@
 #include "inventorywindow.hpp"
 
-#include <cmath>
-#include <algorithm>
-#include <iterator>
-#include <cassert>
-
 #include <boost/lexical_cast.hpp>
 
-#include <components/compiler/locals.hpp>
-
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 
-#include "../mwworld/containerstore.hpp"
-#include "../mwworld/class.hpp"
 #include "../mwworld/player.hpp"
-#include "../mwworld/manualref.hpp"
-#include "../mwworld/actiontake.hpp"
 #include "../mwworld/inventorystore.hpp"
 
-#include "widgets.hpp"
 #include "bookwindow.hpp"
 #include "scrollwindow.hpp"
 #include "spellwindow.hpp"

apps/openmw/mwgui/journalwindow.cpp

@@ -4,9 +4,6 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/journal.hpp"
 #include "../mwbase/soundmanager.hpp"
-#include "../mwbase/windowmanager.hpp"
-
-#include "../mwdialogue/journalentry.hpp"
 
 namespace
 {

apps/openmw/mwgui/levelupdialog.cpp

@@ -8,12 +8,10 @@
 
 #include "../mwworld/player.hpp"
 #include "../mwworld/class.hpp"
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/fallback.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
-#include "../mwmechanics/stat.hpp"
 
 namespace MWGui
 {

apps/openmw/mwgui/loadingscreen.cpp

@@ -1,25 +1,16 @@
 #include "loadingscreen.hpp"
 
 #include <OgreRenderWindow.h>
-#include <OgreRoot.h>
 #include <OgreCompositorManager.h>
 #include <OgreCompositorChain.h>
-#include <OgreMaterial.h>
-
-
-#include <boost/algorithm/string.hpp>
 
 #include <openengine/ogre/fader.hpp>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/inputmanager.hpp"
 #include "../mwbase/world.hpp"
 
 #include "../mwbase/windowmanager.hpp"
 
-#include <components/esm/records.hpp>
-
-
 namespace MWGui
 {
 

apps/openmw/mwgui/mainmenu.cpp

@@ -3,7 +3,6 @@
 #include <OgreRoot.h>
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
 

apps/openmw/mwgui/mapwindow.cpp

@@ -2,12 +2,8 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include <OgreVector2.h>
-#include <OgreTextureManager.h>
 #include <OgreSceneNode.h>
 
-#include <MyGUI_Gui.h>
-
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"

apps/openmw/mwgui/merchantrepair.cpp

@@ -9,10 +9,7 @@
 #include "../mwbase/soundmanager.hpp"
 
 #include "../mwworld/player.hpp"
-#include "../mwworld/containerstore.hpp"
-#include "../mwworld/class.hpp"
 
-#include "list.hpp"
 #include "inventorywindow.hpp"
 #include "tradewindow.hpp"
 

apps/openmw/mwgui/quickkeysmenu.cpp

@@ -2,13 +2,9 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 #include "../mwworld/player.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/actionequip.hpp"
-#include "../mwmechanics/spells.hpp"
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/spellsuccess.hpp"
 #include "../mwgui/inventorywindow.hpp"
 #include "../mwgui/bookwindow.hpp"

apps/openmw/mwgui/race.cpp

@@ -1,19 +1,13 @@
 #include "race.hpp"
 
-#include <iostream>
-#include <iterator>
-
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
 
-#include "../mwworld/esmstore.hpp"
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "widgets.hpp"
 #include "tooltips.hpp"
 
 using namespace MWGui;

apps/openmw/mwgui/review.cpp

@@ -1,17 +1,11 @@
 #include "review.hpp"
 
-#include <cmath>
-
-#include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "../mwworld/esmstore.hpp"
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "widgets.hpp"
 #include "tooltips.hpp"
 
 #undef min

apps/openmw/mwgui/settingswindow.cpp

@@ -1,24 +1,18 @@
 #include "settingswindow.hpp"
 
 #include <OgreRoot.h>
-#include <OgreRenderSystem.h>
 #include <OgrePlugin.h>
-#include <OgreString.h>
 
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/math/common_factor_rt.hpp>
 
-#include <components/settings/settings.hpp>
-
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwrender/renderingmanager.hpp"
-
 #include "confirmationdialog.hpp"
 
 namespace

apps/openmw/mwgui/soulgemdialog.cpp

@@ -1,6 +1,5 @@
 #include "soulgemdialog.hpp"
 
-#include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
 
 #include "messagebox.hpp"

apps/openmw/mwgui/spellbuyingwindow.cpp

@@ -1,7 +1,5 @@
 #include "spellbuyingwindow.hpp"
 
-#include <algorithm>
-
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
@@ -11,9 +9,7 @@
 #include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/player.hpp"
-#include "../mwworld/manualref.hpp"
 
-#include "../mwmechanics/spells.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 
 #include "inventorywindow.hpp"

apps/openmw/mwgui/spellcreationdialog.cpp

@@ -4,22 +4,14 @@
 
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwbase/world.hpp"
-#include "../mwbase/environment.hpp"
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
-#include "../mwworld/esmstore.hpp"
 #include "../mwworld/player.hpp"
-#include "../mwworld/class.hpp"
 
-#include "../mwmechanics/spells.hpp"
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/spellsuccess.hpp"
 
-
 #include "tooltips.hpp"
-#include "widgets.hpp"
 #include "class.hpp"
 #include "inventorywindow.hpp"
 #include "tradewindow.hpp"

apps/openmw/mwgui/spellicons.cpp

@@ -1,9 +1,5 @@
 #include "spellicons.hpp"
 
-#include <MyGUI_Widget.h>
-#include <MyGUI_Gui.h>
-#include <MyGUI_ImageBox.h>
-
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/world.hpp"
@@ -14,7 +10,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
 
-#include "../mwmechanics/activespells.hpp"
 #include "../mwmechanics/creaturestats.hpp"
 
 #include "tooltips.hpp"

apps/openmw/mwgui/spellwindow.cpp

@@ -1,22 +1,14 @@
 #include "spellwindow.hpp"
 
-#include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
 
-#include "../mwworld/esmstore.hpp"
-
-#include "../mwbase/world.hpp"
-#include "../mwbase/environment.hpp"
-#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/player.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/actionequip.hpp"
 
-#include "../mwmechanics/spells.hpp"
-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/spellsuccess.hpp"
 
 #include "spellicons.hpp"

apps/openmw/mwgui/statswindow.cpp

@@ -1,14 +1,9 @@
 #include "statswindow.hpp"
 
-#include <cmath>
-#include <algorithm>
-#include <iterator>
-
 #include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/player.hpp"
@@ -18,7 +13,6 @@
 
 #include "tooltips.hpp"
 
-
 using namespace MWGui;
 const int StatsWindow::sLineHeight = 18;
 

apps/openmw/mwgui/tooltips.cpp

@@ -2,18 +2,11 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include <OgreResourceGroupManager.h>
-
-#include <components/settings/settings.hpp>
-
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwworld/class.hpp"
-
 #include "mapwindow.hpp"
-#include "widgets.hpp"
 #include "inventorywindow.hpp"
 
 using namespace MWGui;

apps/openmw/mwgui/tradewindow.cpp

@@ -9,7 +9,6 @@
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/dialoguemanager.hpp"
 
-#include "../mwworld/inventorystore.hpp"
 #include "../mwworld/manualref.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"

apps/openmw/mwgui/travelwindow.cpp

@@ -1,22 +1,15 @@
 #include "travelwindow.hpp"
 
-#include <algorithm>
-
 #include <boost/lexical_cast.hpp>
 
 #include <libs/openengine/ogre/fader.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
 #include "../mwworld/player.hpp"
-#include "../mwworld/manualref.hpp"
-
-#include "../mwmechanics/spells.hpp"
-#include "../mwmechanics/creaturestats.hpp"
 
 #include "inventorywindow.hpp"
 #include "tradewindow.hpp"

apps/openmw/mwgui/waitdialog.cpp

@@ -1,7 +1,5 @@
 #include "waitdialog.hpp"
 
-#include <cmath>
-
 #include <boost/lexical_cast.hpp>
 
 #include <libs/openengine/ogre/fader.hpp>
@@ -11,9 +9,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 
-#include "../mwworld/timestamp.hpp"
 #include "../mwworld/player.hpp"
-#include "../mwworld/ptr.hpp"
 #include "../mwworld/class.hpp"
 
 #include "../mwmechanics/creaturestats.hpp"

apps/openmw/mwgui/widgets.cpp

@@ -9,8 +9,6 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwworld/esmstore.hpp"
-
 #undef min
 #undef max
 

apps/openmw/mwgui/windowbase.cpp

@@ -1,7 +1,5 @@
 #include "windowbase.hpp"
 
-#include <components/settings/settings.hpp>
-
 #include "../mwbase/windowmanager.hpp"
 
 using namespace MWGui;

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -1,39 +1,20 @@
 #include "windowmanagerimp.hpp"
 
-#include <cassert>
-#include <iterator>
-
-#include <MyGUI_UString.h>
-
 #include <openengine/ogre/renderer.hpp>
 #include <openengine/gui/manager.hpp>
 
-#include <components/settings/settings.hpp>
-#include <components/translation/translation.hpp>
-
-#include "../mwbase/environment.hpp"
-#include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/inputmanager.hpp"
 
-#include "../mwworld/ptr.hpp"
-#include "../mwworld/cellstore.hpp"
-
 #include "console.hpp"
 #include "journalwindow.hpp"
 #include "charactercreation.hpp"
-#include "textinput.hpp"
-#include "review.hpp"
 #include "dialogue.hpp"
 #include "dialoguehistory.hpp"
-#include "mapwindow.hpp"
 #include "statswindow.hpp"
 #include "messagebox.hpp"
-#include "container.hpp"
-#include "inventorywindow.hpp"
 #include "tooltips.hpp"
 #include "scrollwindow.hpp"
 #include "bookwindow.hpp"
-#include "list.hpp"
 #include "hud.hpp"
 #include "mainmenu.hpp"
 #include "countdialog.hpp"
@@ -48,17 +29,15 @@
 #include "loadingscreen.hpp"
 #include "levelupdialog.hpp"
 #include "waitdialog.hpp"
-#include "spellcreationdialog.hpp"
 #include "enchantingdialog.hpp"
 #include "trainingwindow.hpp"
-#include "imagebutton.hpp"
 #include "exposedwindow.hpp"
 #include "cursor.hpp"
-#include "spellicons.hpp"
 #include "merchantrepair.hpp"
 #include "repair.hpp"
 #include "soulgemdialog.hpp"
 #include "companionwindow.hpp"
+#include "inventorywindow.hpp"
 
 using namespace MWGui;
 

apps/openmw/mwgui/windowpinnablebase.cpp

@@ -1,7 +1,5 @@
 #include "windowpinnablebase.hpp"
 
-#include "../mwbase/windowmanager.hpp"
-
 #include "exposedwindow.hpp"
 
 using namespace MWGui;