From 5a7b95bf7ac94201f9ac38dd92da0867a097f850 Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Tue, 3 Jul 2012 13:15:20 +0200 Subject: [PATCH] Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp --- apps/openmw/mwclass/activator.cpp | 3 +++ apps/openmw/mwclass/apparatus.cpp | 2 ++ apps/openmw/mwclass/armor.cpp | 3 +++ apps/openmw/mwclass/book.cpp | 3 +++ apps/openmw/mwclass/clothing.cpp | 2 ++ apps/openmw/mwclass/container.cpp | 4 +++- apps/openmw/mwclass/creature.cpp | 4 ++++ apps/openmw/mwclass/door.cpp | 2 ++ apps/openmw/mwclass/ingredient.cpp | 2 ++ apps/openmw/mwclass/light.cpp | 2 ++ apps/openmw/mwclass/lockpick.cpp | 2 ++ apps/openmw/mwclass/misc.cpp | 2 ++ apps/openmw/mwclass/npc.cpp | 3 +++ apps/openmw/mwclass/potion.cpp | 2 ++ apps/openmw/mwclass/probe.cpp | 2 ++ apps/openmw/mwclass/repair.cpp | 2 ++ apps/openmw/mwclass/static.cpp | 2 ++ apps/openmw/mwclass/weapon.cpp | 2 ++ apps/openmw/mwgui/alchemywindow.hpp | 1 + apps/openmw/mwgui/hud.cpp | 2 ++ apps/openmw/mwrender/npcanimation.cpp | 2 ++ apps/openmw/mwworld/cells.cpp | 2 ++ apps/openmw/mwworld/class.cpp | 2 ++ apps/openmw/mwworld/class.hpp | 13 +++++++------ apps/openmw/mwworld/inventorystore.cpp | 2 ++ apps/openmw/mwworld/player.cpp | 2 ++ apps/openmw/mwworld/weather.cpp | 3 ++- apps/openmw/mwworld/worldimp.hpp | 2 ++ 28 files changed, 67 insertions(+), 8 deletions(-) diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp index d8b8d54e8..81a47ccb0 100644 --- a/apps/openmw/mwclass/activator.cpp +++ b/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 { diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp index 55f5bc11f..7e3c3b8f9 100644 --- a/apps/openmw/mwclass/apparatus.cpp +++ b/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" diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp index 9e029d005..380c596d7 100644 --- a/apps/openmw/mwclass/armor.cpp +++ b/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" diff --git a/apps/openmw/mwclass/book.cpp b/apps/openmw/mwclass/book.cpp index 780e2e0f5..a37da0fd7 100644 --- a/apps/openmw/mwclass/book.cpp +++ b/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" diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp index 04a1f3ee6..6c34b5e56 100644 --- a/apps/openmw/mwclass/clothing.cpp +++ b/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" diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp index 0c8682df4..8dd27db42 100644 --- a/apps/openmw/mwclass/container.cpp +++ b/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" diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp index ff96692d0..a5a4f337a 100644 --- a/apps/openmw/mwclass/creature.cpp +++ b/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 { diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp index 9148d3575..b0bba2c03 100644 --- a/apps/openmw/mwclass/door.cpp +++ b/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" diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp index bc68e46b2..01146fe67 100644 --- a/apps/openmw/mwclass/ingredient.cpp +++ b/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" diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp index 9fa11be5e..15cd89ac2 100644 --- a/apps/openmw/mwclass/light.cpp +++ b/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 { diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp index b35172f2f..d3d60315f 100644 --- a/apps/openmw/mwclass/lockpick.cpp +++ b/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" diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp index 1163b43b2..8484a5dd1 100644 --- a/apps/openmw/mwclass/misc.cpp +++ b/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" diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp index e1b8541a1..d4f711885 100644 --- a/apps/openmw/mwclass/npc.cpp +++ b/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 { diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp index cd393f388..5b446fbe9 100644 --- a/apps/openmw/mwclass/potion.cpp +++ b/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" diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp index a8bfdead1..f3a8406f5 100644 --- a/apps/openmw/mwclass/probe.cpp +++ b/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" diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp index 4a4550ba1..464ba1091 100644 --- a/apps/openmw/mwclass/repair.cpp +++ b/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" diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp index dbc697f8b..9b166b076 100644 --- a/apps/openmw/mwclass/static.cpp +++ b/apps/openmw/mwclass/static.cpp @@ -4,8 +4,10 @@ #include #include "../mwworld/ptr.hpp" +#include "../mwworld/physicssystem.hpp" #include "../mwrender/objects.hpp" +#include "../mwrender/renderinginterface.hpp" namespace MWClass { diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp index 90f98afb9..099312d2c 100644 --- a/apps/openmw/mwclass/weapon.cpp +++ b/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" diff --git a/apps/openmw/mwgui/alchemywindow.hpp b/apps/openmw/mwgui/alchemywindow.hpp index c01a18e41..81c33a96d 100644 --- a/apps/openmw/mwgui/alchemywindow.hpp +++ b/apps/openmw/mwgui/alchemywindow.hpp @@ -3,6 +3,7 @@ #include "window_base.hpp" #include "container.hpp" +#include "widgets.hpp" namespace MWGui { diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp index ebba1661b..8762a9b7a 100644 --- a/apps/openmw/mwgui/hud.cpp +++ b/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" diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp index 888b11e1e..6fc61904c 100644 --- a/apps/openmw/mwrender/npcanimation.cpp +++ b/apps/openmw/mwrender/npcanimation.cpp @@ -1,5 +1,7 @@ #include "npcanimation.hpp" +#include + #include "../mwbase/environment.hpp" #include "../mwbase/world.hpp" diff --git a/apps/openmw/mwworld/cells.cpp b/apps/openmw/mwworld/cells.cpp index e2c652ef4..74a91f25f 100644 --- a/apps/openmw/mwworld/cells.cpp +++ b/apps/openmw/mwworld/cells.cpp @@ -4,6 +4,8 @@ #include +#include + #include "../mwbase/environment.hpp" #include "../mwbase/world.hpp" diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp index fe39406fe..13b40ddbb 100644 --- a/apps/openmw/mwworld/class.cpp +++ b/apps/openmw/mwworld/class.cpp @@ -9,6 +9,8 @@ #include "nullaction.hpp" #include "containerstore.hpp" +#include "../mwgui/tooltips.hpp" + namespace MWWorld { std::map > Class::sClasses; diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp index 46781d516..fe7b5dc80 100644 --- a/apps/openmw/mwworld/class.hpp +++ b/apps/openmw/mwworld/class.hpp @@ -8,11 +8,6 @@ #include #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 diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp index b1f7a2e0d..9d99227ed 100644 --- a/apps/openmw/mwworld/inventorystore.cpp +++ b/apps/openmw/mwworld/inventorystore.cpp @@ -6,6 +6,8 @@ #include +#include + #include "../mwbase/environment.hpp" #include "../mwbase/world.hpp" diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp index 3edcba0c8..0eeebad4e 100644 --- a/apps/openmw/mwworld/player.cpp +++ b/apps/openmw/mwworld/player.cpp @@ -1,6 +1,8 @@ #include "player.hpp" +#include + #include "../mwbase/environment.hpp" #include "../mwbase/world.hpp" diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp index 21f991050..6c275ff80 100644 --- a/apps/openmw/mwworld/weather.cpp +++ b/apps/openmw/mwworld/weather.cpp @@ -2,10 +2,11 @@ #include #include -#include #include +#include + #include "../mwbase/environment.hpp" #include "../mwbase/world.hpp" diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp index b38bc6e2a..d64b3a373 100644 --- a/apps/openmw/mwworld/worldimp.hpp +++ b/apps/openmw/mwworld/worldimp.hpp @@ -6,6 +6,8 @@ #include +#include + #include #include "../mwrender/debugging.hpp"