Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp

apps/openmw/mwclass/activator.cpp

@@ -7,10 +7,13 @@
 
 #include "../mwworld//cellstore.hpp"
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwgui/window_manager.hpp"
+#include "../mwgui/tooltips.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/apparatus.cpp

@@ -10,8 +10,10 @@
 #include "../mwworld/actiontake.hpp"
 #include "../mwworld/actionalchemy.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"

apps/openmw/mwclass/armor.cpp

@@ -13,10 +13,13 @@
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwgui/window_manager.hpp"
+#include "../mwgui/tooltips.hpp"
 
 #include "../mwsound/soundmanager.hpp"
 

apps/openmw/mwclass/book.cpp

@@ -9,10 +9,13 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actionread.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwgui/window_manager.hpp"
+#include "../mwgui/tooltips.hpp"
 
 #include "../mwsound/soundmanager.hpp"
 

apps/openmw/mwclass/clothing.cpp

@@ -11,11 +11,13 @@
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwgui/tooltips.hpp"
 #include "../mwgui/window_manager.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwsound/soundmanager.hpp"
 

apps/openmw/mwclass/container.cpp

@@ -11,12 +11,14 @@
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/customdata.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/actionopen.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
-#include "../mwworld/actionopen.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwsound/soundmanager.hpp"
 

apps/openmw/mwclass/creature.cpp

@@ -13,8 +13,12 @@
 #include "../mwworld/actiontalk.hpp"
 #include "../mwworld/customdata.hpp"
 #include "../mwworld/containerstore.hpp"
+#include "../mwworld/physicssystem.hpp"
+
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwgui/window_manager.hpp"
+#include "../mwgui/tooltips.hpp"
 
 namespace
 {

apps/openmw/mwclass/door.cpp

@@ -11,11 +11,13 @@
 #include "../mwworld/nullaction.hpp"
 #include "../mwworld/actionteleport.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwsound/soundmanager.hpp"
 

apps/openmw/mwclass/ingredient.cpp

@@ -9,11 +9,13 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwsound/soundmanager.hpp"
 

apps/openmw/mwclass/light.cpp

@@ -12,6 +12,7 @@
 #include "../mwworld/nullaction.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
@@ -19,6 +20,7 @@
 #include "../mwsound/soundmanager.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/lockpick.cpp

@@ -11,11 +11,13 @@
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwsound/soundmanager.hpp"
 

apps/openmw/mwclass/misc.cpp

@@ -11,11 +11,13 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwsound/soundmanager.hpp"
 

apps/openmw/mwclass/npc.cpp

@@ -21,10 +21,13 @@
 #include "../mwworld/actiontalk.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/customdata.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwrender/actors.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwgui/window_manager.hpp"
+#include "../mwgui/tooltips.hpp"
 
 namespace
 {

apps/openmw/mwclass/potion.cpp

@@ -9,11 +9,13 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwsound/soundmanager.hpp"
 

apps/openmw/mwclass/probe.cpp

@@ -11,11 +11,13 @@
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwsound/soundmanager.hpp"
 

apps/openmw/mwclass/repair.cpp

@@ -9,11 +9,13 @@
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/actiontake.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwsound/soundmanager.hpp"
 

apps/openmw/mwclass/static.cpp

@@ -4,8 +4,10 @@
 #include <components/esm/loadstat.hpp>
 
 #include "../mwworld/ptr.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 namespace MWClass
 {

apps/openmw/mwclass/weapon.cpp

@@ -11,11 +11,13 @@
 #include "../mwworld/actionequip.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/physicssystem.hpp"
 
 #include "../mwgui/window_manager.hpp"
 #include "../mwgui/tooltips.hpp"
 
 #include "../mwrender/objects.hpp"
+#include "../mwrender/renderinginterface.hpp"
 
 #include "../mwsound/soundmanager.hpp"
 

apps/openmw/mwgui/alchemywindow.hpp

@@ -3,6 +3,7 @@
 
 #include "window_base.hpp"
 #include "container.hpp"
+#include "widgets.hpp"
 
 namespace MWGui
 {

apps/openmw/mwgui/hud.cpp

@@ -14,6 +14,8 @@
 
 #include "../mwsound/soundmanager.hpp"
 
+#include "../mwgui/widgets.hpp"
+
 #include "inventorywindow.hpp"
 #include "window_manager.hpp"
 #include "container.hpp"

apps/openmw/mwrender/npcanimation.cpp

@@ -1,5 +1,7 @@
 #include "npcanimation.hpp"
 
+#include <components/esm_store/store.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 

apps/openmw/mwworld/cells.cpp

@@ -4,6 +4,8 @@
 
 #include <algorithm>
 
+#include <components/esm_store/store.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 

apps/openmw/mwworld/class.cpp

@@ -9,6 +9,8 @@
 #include "nullaction.hpp"
 #include "containerstore.hpp"
 
+#include "../mwgui/tooltips.hpp"
+
 namespace MWWorld
 {
     std::map<std::string, boost::shared_ptr<Class> > Class::sClasses;

apps/openmw/mwworld/class.hpp

@@ -8,11 +8,6 @@
 #include <boost/shared_ptr.hpp>
 
 #include "action.hpp"
-#include "refdata.hpp"
-#include "physicssystem.hpp"
-
-#include "../mwrender/renderinginterface.hpp"
-#include "../mwgui/tooltips.hpp"
 
 namespace Ogre
 {
@@ -21,7 +16,7 @@ namespace Ogre
 
 namespace MWRender
 {
-    class CellRenderImp;
+    class RenderingInterface;
 }
 
 namespace MWMechanics
@@ -31,11 +26,17 @@ namespace MWMechanics
     struct Movement;
 }
 
+namespace MWGui
+{
+    struct ToolTipInfo;
+}
+
 namespace MWWorld
 {
     class Ptr;
     class ContainerStore;
     class InventoryStore;
+    class PhysicsSystem;
 
     /// \brief Base class for referenceable esm records
     class Class

apps/openmw/mwworld/inventorystore.cpp

@@ -6,6 +6,8 @@
 
 #include <components/esm/loadench.hpp>
 
+#include <components/esm_store/store.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 

apps/openmw/mwworld/player.cpp

@@ -1,6 +1,8 @@
 
 #include "player.hpp"
 
+#include <components/esm_store/store.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 

apps/openmw/mwworld/weather.cpp

@@ -2,10 +2,11 @@
 
 #include <ctime>
 #include <cstdlib>
-#include <iostream>
 
 #include <boost/algorithm/string.hpp>
 
+#include <components/esm_store/store.hpp>
+
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 

apps/openmw/mwworld/worldimp.hpp

@@ -6,6 +6,8 @@
 
 #include <boost/filesystem.hpp>
 
+#include <components/esm_store/store.hpp>
+
 #include <components/settings/settings.hpp>
 
 #include "../mwrender/debugging.hpp"