From f6fce5ee15b2150e44aef852ed114812fba95cf2 Mon Sep 17 00:00:00 2001 From: elsid Date: Fri, 7 Jul 2023 22:39:14 +0200 Subject: [PATCH] Cleanup includes --- apps/launcher/importpage.cpp | 2 -- apps/openmw/mwclass/armor.cpp | 1 - apps/openmw/mwclass/clothing.cpp | 1 - apps/openmw/mwclass/esm4base.cpp | 2 -- apps/openmw/mwclass/light4.cpp | 3 --- apps/openmw/mwclass/static.hpp | 4 ---- apps/openmw/mwdialogue/hypertextparser.cpp | 1 - apps/openmw/mwdialogue/quest.cpp | 1 - apps/openmw/mwdialogue/scripttest.cpp | 1 - apps/openmw/mwdialogue/topic.cpp | 1 - apps/openmw/mwgui/console.cpp | 1 - apps/openmw/mwgui/itemchargeview.cpp | 1 - apps/openmw/mwgui/merchantrepair.cpp | 1 - apps/openmw/mwgui/race.cpp | 1 - apps/openmw/mwgui/recharge.cpp | 1 - apps/openmw/mwgui/spellbuyingwindow.cpp | 1 - apps/openmw/mwgui/spellcreationdialog.cpp | 1 - apps/openmw/mwgui/spellmodel.cpp | 1 - apps/openmw/mwgui/statswatcher.cpp | 1 - apps/openmw/mwgui/widgets.cpp | 1 - apps/openmw/mwinput/actionmanager.cpp | 3 --- apps/openmw/mwinput/bindingsmanager.cpp | 3 --- apps/openmw/mwinput/controlswitch.cpp | 2 -- apps/openmw/mwinput/sensormanager.cpp | 6 ------ apps/openmw/mwinput/sensormanager.hpp | 2 ++ apps/openmw/mwlua/camerabindings.cpp | 1 - apps/openmw/mwlua/cellbindings.cpp | 1 - apps/openmw/mwlua/localscripts.cpp | 1 - apps/openmw/mwlua/luamanagerimp.cpp | 1 - apps/openmw/mwlua/magicbindings.cpp | 4 ---- apps/openmw/mwlua/objectbindings.cpp | 1 - apps/openmw/mwlua/types/door.cpp | 3 --- apps/openmw/mwlua/types/item.cpp | 2 -- apps/openmw/mwlua/types/lockable.cpp | 3 --- apps/openmw/mwmechanics/aibreathe.cpp | 1 - apps/openmw/mwmechanics/autocalcspell.cpp | 1 - apps/openmw/mwmechanics/inventory.hpp | 1 - apps/openmw/mwmechanics/magiceffects.cpp | 1 - apps/openmw/mwmechanics/npcstats.cpp | 1 - apps/openmw/mwmechanics/setbaseaisetting.hpp | 1 - apps/openmw/mwmechanics/spelllist.cpp | 1 - apps/openmw/mwphysics/movementsolver.cpp | 1 - apps/openmw/mwrender/globalmap.cpp | 1 - apps/openmw/mwrender/localmap.cpp | 1 - apps/openmw/mwrender/terrainstorage.cpp | 1 - apps/openmw/mwscript/interpretercontext.cpp | 1 - apps/openmw/mwscript/locals.cpp | 1 - apps/openmw/mwsound/regionsoundselector.cpp | 1 - apps/openmw/mwsound/sound_buffer.cpp | 1 - apps/openmw/mwworld/actionapply.cpp | 2 -- apps/openmw/mwworld/actionread.cpp | 1 - apps/openmw/mwworld/actionsoulgem.cpp | 1 - apps/openmw/mwworld/datetimemanager.cpp | 2 -- apps/openmw/mwworld/inventorystore.cpp | 1 - apps/openmw/mwworld/livecellref.cpp | 1 - apps/openmw/mwworld/magiceffects.cpp | 1 - apps/openmw/mwworld/store.cpp | 2 -- components/config/gamesettings.cpp | 1 - components/esm3/aisequence.hpp | 1 - components/esm3/cellref.hpp | 2 -- components/esm3/esmreader.cpp | 1 - components/esm3/loadweap.hpp | 1 - components/esm3/variant.cpp | 2 -- components/sceneutil/lightutil.cpp | 1 - components/settings/categories/hud.hpp | 1 - components/settings/categories/models.hpp | 1 - components/settings/categories/stereo.hpp | 1 - 67 files changed, 2 insertions(+), 96 deletions(-) diff --git a/apps/launcher/importpage.cpp b/apps/launcher/importpage.cpp index af79938756..fa91ad1654 100644 --- a/apps/launcher/importpage.cpp +++ b/apps/launcher/importpage.cpp @@ -8,8 +8,6 @@ #include #include -#include "utils/textinputdialog.hpp" - using namespace Process; Launcher::ImportPage::ImportPage(const Files::ConfigurationManager& cfg, Config::GameSettings& gameSettings, diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp index 8b23349f09..54561e3b0f 100644 --- a/apps/openmw/mwclass/armor.cpp +++ b/apps/openmw/mwclass/armor.cpp @@ -10,7 +10,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/actionequip.hpp" #include "../mwworld/cellstore.hpp" diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp index b92422c43a..cbc5cecb70 100644 --- a/apps/openmw/mwclass/clothing.cpp +++ b/apps/openmw/mwclass/clothing.cpp @@ -8,7 +8,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/actionequip.hpp" #include "../mwworld/cellstore.hpp" diff --git a/apps/openmw/mwclass/esm4base.cpp b/apps/openmw/mwclass/esm4base.cpp index a99ecda928..956fc210ee 100644 --- a/apps/openmw/mwclass/esm4base.cpp +++ b/apps/openmw/mwclass/esm4base.cpp @@ -14,8 +14,6 @@ #include "../mwphysics/physicssystem.hpp" #include "../mwworld/ptr.hpp" -#include "classmodel.hpp" - namespace MWClass { void ESM4Impl::insertObjectRendering( diff --git a/apps/openmw/mwclass/light4.cpp b/apps/openmw/mwclass/light4.cpp index 8c2cd1fdaa..6d3fa5d9d8 100644 --- a/apps/openmw/mwclass/light4.cpp +++ b/apps/openmw/mwclass/light4.cpp @@ -1,10 +1,7 @@ #include "light4.hpp" -#include "classmodel.hpp" -#include "../mwphysics/physicssystem.hpp" #include "../mwrender/objects.hpp" #include "../mwrender/renderinginterface.hpp" -#include "../mwworld/cellstore.hpp" #include "../mwworld/ptr.hpp" #include diff --git a/apps/openmw/mwclass/static.hpp b/apps/openmw/mwclass/static.hpp index 0d853211bb..65f60f7653 100644 --- a/apps/openmw/mwclass/static.hpp +++ b/apps/openmw/mwclass/static.hpp @@ -1,13 +1,9 @@ #ifndef GAME_MWCLASS_STATIC_H #define GAME_MWCLASS_STATIC_H -#include "../mwgui/tooltips.hpp" #include "../mwworld/cellstore.hpp" #include "../mwworld/registeredclass.hpp" -#include "classmodel.hpp" - -#include "../mwgui/ustring.hpp" #include namespace MWClass diff --git a/apps/openmw/mwdialogue/hypertextparser.cpp b/apps/openmw/mwdialogue/hypertextparser.cpp index 11a2de77b5..de82aff7aa 100644 --- a/apps/openmw/mwdialogue/hypertextparser.cpp +++ b/apps/openmw/mwdialogue/hypertextparser.cpp @@ -1,7 +1,6 @@ #include #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/esmstore.hpp" #include "../mwworld/store.hpp" diff --git a/apps/openmw/mwdialogue/quest.cpp b/apps/openmw/mwdialogue/quest.cpp index 0fdb918859..1234ae0a26 100644 --- a/apps/openmw/mwdialogue/quest.cpp +++ b/apps/openmw/mwdialogue/quest.cpp @@ -7,7 +7,6 @@ #include "../mwworld/esmstore.hpp" #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" namespace MWDialogue { diff --git a/apps/openmw/mwdialogue/scripttest.cpp b/apps/openmw/mwdialogue/scripttest.cpp index fd5a240711..6ca48d9490 100644 --- a/apps/openmw/mwdialogue/scripttest.cpp +++ b/apps/openmw/mwdialogue/scripttest.cpp @@ -6,7 +6,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/scriptmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwscript/compilercontext.hpp" diff --git a/apps/openmw/mwdialogue/topic.cpp b/apps/openmw/mwdialogue/topic.cpp index 2b51c27fb1..356162da62 100644 --- a/apps/openmw/mwdialogue/topic.cpp +++ b/apps/openmw/mwdialogue/topic.cpp @@ -1,7 +1,6 @@ #include "topic.hpp" #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/esmstore.hpp" diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp index 2532a676e5..2f134e420f 100644 --- a/apps/openmw/mwgui/console.cpp +++ b/apps/openmw/mwgui/console.cpp @@ -25,7 +25,6 @@ #include "../mwbase/luamanager.hpp" #include "../mwbase/scriptmanager.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/class.hpp" #include "../mwworld/esmstore.hpp" diff --git a/apps/openmw/mwgui/itemchargeview.cpp b/apps/openmw/mwgui/itemchargeview.cpp index f50db3cb6b..92fff6f873 100644 --- a/apps/openmw/mwgui/itemchargeview.cpp +++ b/apps/openmw/mwgui/itemchargeview.cpp @@ -10,7 +10,6 @@ #include #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "../mwmechanics/spellutil.hpp" diff --git a/apps/openmw/mwgui/merchantrepair.cpp b/apps/openmw/mwgui/merchantrepair.cpp index e520f9cb28..00d7b7f638 100644 --- a/apps/openmw/mwgui/merchantrepair.cpp +++ b/apps/openmw/mwgui/merchantrepair.cpp @@ -9,7 +9,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/creaturestats.hpp" diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp index 6f1a615dd9..afccae471f 100644 --- a/apps/openmw/mwgui/race.cpp +++ b/apps/openmw/mwgui/race.cpp @@ -15,7 +15,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwrender/characterpreview.hpp" #include "../mwworld/esmstore.hpp" diff --git a/apps/openmw/mwgui/recharge.cpp b/apps/openmw/mwgui/recharge.cpp index 96ca425c6c..ba35a666d5 100644 --- a/apps/openmw/mwgui/recharge.cpp +++ b/apps/openmw/mwgui/recharge.cpp @@ -8,7 +8,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/class.hpp" #include "../mwworld/esmstore.hpp" diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp index 66ef981dd0..79a0f517da 100644 --- a/apps/openmw/mwgui/spellbuyingwindow.cpp +++ b/apps/openmw/mwgui/spellbuyingwindow.cpp @@ -10,7 +10,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/class.hpp" #include "../mwworld/containerstore.hpp" diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp index d515724e5b..0c326049e8 100644 --- a/apps/openmw/mwgui/spellcreationdialog.cpp +++ b/apps/openmw/mwgui/spellcreationdialog.cpp @@ -14,7 +14,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/class.hpp" #include "../mwworld/containerstore.hpp" diff --git a/apps/openmw/mwgui/spellmodel.cpp b/apps/openmw/mwgui/spellmodel.cpp index a995865ca6..181ee28bea 100644 --- a/apps/openmw/mwgui/spellmodel.cpp +++ b/apps/openmw/mwgui/spellmodel.cpp @@ -8,7 +8,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwmechanics/creaturestats.hpp" #include "../mwmechanics/spellutil.hpp" diff --git a/apps/openmw/mwgui/statswatcher.cpp b/apps/openmw/mwgui/statswatcher.cpp index b18073f7ad..fe2493b754 100644 --- a/apps/openmw/mwgui/statswatcher.cpp +++ b/apps/openmw/mwgui/statswatcher.cpp @@ -5,7 +5,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwmechanics/npcstats.hpp" diff --git a/apps/openmw/mwgui/widgets.cpp b/apps/openmw/mwgui/widgets.cpp index de4f954438..a161eed25b 100644 --- a/apps/openmw/mwgui/widgets.cpp +++ b/apps/openmw/mwgui/widgets.cpp @@ -15,7 +15,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwmechanics/magiceffects.hpp" diff --git a/apps/openmw/mwinput/actionmanager.cpp b/apps/openmw/mwinput/actionmanager.cpp index b8a9b4edab..87737204f6 100644 --- a/apps/openmw/mwinput/actionmanager.cpp +++ b/apps/openmw/mwinput/actionmanager.cpp @@ -16,14 +16,11 @@ #include "../mwworld/class.hpp" #include "../mwworld/globals.hpp" -#include "../mwworld/inventorystore.hpp" #include "../mwworld/player.hpp" #include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/npcstats.hpp" -#include "../mwgui/messagebox.hpp" - #include "actions.hpp" #include "bindingsmanager.hpp" diff --git a/apps/openmw/mwinput/bindingsmanager.cpp b/apps/openmw/mwinput/bindingsmanager.cpp index a3bd4e28fb..488c3c7c32 100644 --- a/apps/openmw/mwinput/bindingsmanager.cpp +++ b/apps/openmw/mwinput/bindingsmanager.cpp @@ -11,9 +11,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/inputmanager.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" - -#include "../mwworld/player.hpp" #include "actions.hpp" diff --git a/apps/openmw/mwinput/controlswitch.cpp b/apps/openmw/mwinput/controlswitch.cpp index bf9842ae30..974cfbbbb5 100644 --- a/apps/openmw/mwinput/controlswitch.cpp +++ b/apps/openmw/mwinput/controlswitch.cpp @@ -9,8 +9,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/world.hpp" -#include "../mwworld/player.hpp" - namespace MWInput { ControlSwitch::ControlSwitch() diff --git a/apps/openmw/mwinput/sensormanager.cpp b/apps/openmw/mwinput/sensormanager.cpp index 33b493f4d4..d700d292cc 100644 --- a/apps/openmw/mwinput/sensormanager.cpp +++ b/apps/openmw/mwinput/sensormanager.cpp @@ -2,12 +2,6 @@ #include -#include "../mwbase/environment.hpp" -#include "../mwbase/inputmanager.hpp" -#include "../mwbase/world.hpp" - -#include "../mwworld/player.hpp" - namespace MWInput { SensorManager::SensorManager() diff --git a/apps/openmw/mwinput/sensormanager.hpp b/apps/openmw/mwinput/sensormanager.hpp index 96d46d6280..62a1a62d21 100644 --- a/apps/openmw/mwinput/sensormanager.hpp +++ b/apps/openmw/mwinput/sensormanager.hpp @@ -1,6 +1,8 @@ #ifndef MWINPUT_MWSENSORMANAGER_H #define MWINPUT_MWSENSORMANAGER_H +#include + #include #include diff --git a/apps/openmw/mwlua/camerabindings.cpp b/apps/openmw/mwlua/camerabindings.cpp index bd5c43d24c..bbdba00ee2 100644 --- a/apps/openmw/mwlua/camerabindings.cpp +++ b/apps/openmw/mwlua/camerabindings.cpp @@ -1,4 +1,3 @@ -#include "luabindings.hpp" #include #include diff --git a/apps/openmw/mwlua/cellbindings.cpp b/apps/openmw/mwlua/cellbindings.cpp index e961168bee..ade50cf289 100644 --- a/apps/openmw/mwlua/cellbindings.cpp +++ b/apps/openmw/mwlua/cellbindings.cpp @@ -6,7 +6,6 @@ #include "../mwworld/cellstore.hpp" #include "types/types.hpp" -#include "worldview.hpp" namespace sol { diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp index 4972a62744..26f6b75299 100644 --- a/apps/openmw/mwlua/localscripts.cpp +++ b/apps/openmw/mwlua/localscripts.cpp @@ -16,7 +16,6 @@ #include "../mwworld/ptr.hpp" #include "context.hpp" -#include "worldview.hpp" namespace sol { diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp index 285a378eaf..2d0abd38a1 100644 --- a/apps/openmw/mwlua/luamanagerimp.cpp +++ b/apps/openmw/mwlua/luamanagerimp.cpp @@ -23,7 +23,6 @@ #include "../mwrender/postprocessor.hpp" -#include "../mwworld/class.hpp" #include "../mwworld/esmstore.hpp" #include "../mwworld/ptr.hpp" #include "../mwworld/scene.hpp" diff --git a/apps/openmw/mwlua/magicbindings.cpp b/apps/openmw/mwlua/magicbindings.cpp index 4e01f4c79d..5026cc44cc 100644 --- a/apps/openmw/mwlua/magicbindings.cpp +++ b/apps/openmw/mwlua/magicbindings.cpp @@ -10,15 +10,12 @@ #include #include "../mwbase/environment.hpp" -#include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/windowmanager.hpp" #include "../mwbase/world.hpp" #include "../mwmechanics/activespells.hpp" #include "../mwmechanics/creaturestats.hpp" #include "../mwmechanics/magiceffects.hpp" -#include "../mwmechanics/npcstats.hpp" #include "../mwmechanics/spellutil.hpp" -#include "../mwworld/action.hpp" #include "../mwworld/class.hpp" #include "../mwworld/esmstore.hpp" @@ -26,7 +23,6 @@ #include "luamanagerimp.hpp" #include "object.hpp" #include "objectvariant.hpp" -#include "worldview.hpp" namespace MWLua { diff --git a/apps/openmw/mwlua/objectbindings.cpp b/apps/openmw/mwlua/objectbindings.cpp index 36e692abae..24c43d739a 100644 --- a/apps/openmw/mwlua/objectbindings.cpp +++ b/apps/openmw/mwlua/objectbindings.cpp @@ -15,7 +15,6 @@ #include "../mwworld/scene.hpp" #include "../mwrender/renderingmanager.hpp" -#include "../mwrender/vismask.hpp" #include "../mwmechanics/creaturestats.hpp" diff --git a/apps/openmw/mwlua/types/door.cpp b/apps/openmw/mwlua/types/door.cpp index 217a6fa958..4505f2db7e 100644 --- a/apps/openmw/mwlua/types/door.cpp +++ b/apps/openmw/mwlua/types/door.cpp @@ -9,9 +9,6 @@ #include -#include "../luabindings.hpp" -#include "../worldview.hpp" - namespace sol { template <> diff --git a/apps/openmw/mwlua/types/item.cpp b/apps/openmw/mwlua/types/item.cpp index cc3695786b..604a628d8f 100644 --- a/apps/openmw/mwlua/types/item.cpp +++ b/apps/openmw/mwlua/types/item.cpp @@ -1,5 +1,3 @@ -#include "../luabindings.hpp" -#include "../worldview.hpp" #include "types.hpp" diff --git a/apps/openmw/mwlua/types/lockable.cpp b/apps/openmw/mwlua/types/lockable.cpp index 2a400f3ccf..e7413edef5 100644 --- a/apps/openmw/mwlua/types/lockable.cpp +++ b/apps/openmw/mwlua/types/lockable.cpp @@ -7,9 +7,6 @@ #include -#include "../luabindings.hpp" -#include "../worldview.hpp" - namespace MWLua { diff --git a/apps/openmw/mwmechanics/aibreathe.cpp b/apps/openmw/mwmechanics/aibreathe.cpp index ab0344d86a..b3c3648d6d 100644 --- a/apps/openmw/mwmechanics/aibreathe.cpp +++ b/apps/openmw/mwmechanics/aibreathe.cpp @@ -1,7 +1,6 @@ #include "aibreathe.hpp" #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/class.hpp" #include "../mwworld/esmstore.hpp" diff --git a/apps/openmw/mwmechanics/autocalcspell.cpp b/apps/openmw/mwmechanics/autocalcspell.cpp index 08c76e900f..13fcef073f 100644 --- a/apps/openmw/mwmechanics/autocalcspell.cpp +++ b/apps/openmw/mwmechanics/autocalcspell.cpp @@ -11,7 +11,6 @@ #include "../mwworld/esmstore.hpp" #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "spellutil.hpp" diff --git a/apps/openmw/mwmechanics/inventory.hpp b/apps/openmw/mwmechanics/inventory.hpp index 5185d540c6..2c593566e1 100644 --- a/apps/openmw/mwmechanics/inventory.hpp +++ b/apps/openmw/mwmechanics/inventory.hpp @@ -2,7 +2,6 @@ #define OPENMW_MWMECHANICS_INVENTORY_H #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/esmstore.hpp" diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp index e75a1184a4..b64799fe08 100644 --- a/apps/openmw/mwmechanics/magiceffects.cpp +++ b/apps/openmw/mwmechanics/magiceffects.cpp @@ -11,7 +11,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/esmstore.hpp" diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp index 7729432414..ce779418af 100644 --- a/apps/openmw/mwmechanics/npcstats.cpp +++ b/apps/openmw/mwmechanics/npcstats.cpp @@ -16,7 +16,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" MWMechanics::NpcStats::NpcStats() : mDisposition(0) diff --git a/apps/openmw/mwmechanics/setbaseaisetting.hpp b/apps/openmw/mwmechanics/setbaseaisetting.hpp index 07e69dddd2..c7624c30e4 100644 --- a/apps/openmw/mwmechanics/setbaseaisetting.hpp +++ b/apps/openmw/mwmechanics/setbaseaisetting.hpp @@ -4,7 +4,6 @@ #include #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/esmstore.hpp" diff --git a/apps/openmw/mwmechanics/spelllist.cpp b/apps/openmw/mwmechanics/spelllist.cpp index 1e27ca5763..d7ad7c3af1 100644 --- a/apps/openmw/mwmechanics/spelllist.cpp +++ b/apps/openmw/mwmechanics/spelllist.cpp @@ -9,7 +9,6 @@ #include "spells.hpp" #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/esmstore.hpp" diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp index 8ba9f44c73..c0b5014b31 100644 --- a/apps/openmw/mwphysics/movementsolver.cpp +++ b/apps/openmw/mwphysics/movementsolver.cpp @@ -8,7 +8,6 @@ #include #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/esmstore.hpp" diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp index d8b0889aa3..d2137a0e15 100644 --- a/apps/openmw/mwrender/globalmap.cpp +++ b/apps/openmw/mwrender/globalmap.cpp @@ -20,7 +20,6 @@ #include #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/esmstore.hpp" diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp index 937aa91161..5f85182f87 100644 --- a/apps/openmw/mwrender/localmap.cpp +++ b/apps/openmw/mwrender/localmap.cpp @@ -27,7 +27,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/cellstore.hpp" diff --git a/apps/openmw/mwrender/terrainstorage.cpp b/apps/openmw/mwrender/terrainstorage.cpp index 97ae99cd4f..3ae99e9465 100644 --- a/apps/openmw/mwrender/terrainstorage.cpp +++ b/apps/openmw/mwrender/terrainstorage.cpp @@ -1,7 +1,6 @@ #include "terrainstorage.hpp" #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/esmstore.hpp" #include "landmanager.hpp" diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp index f9d777aaff..15c9100b98 100644 --- a/apps/openmw/mwscript/interpretercontext.cpp +++ b/apps/openmw/mwscript/interpretercontext.cpp @@ -10,7 +10,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/inputmanager.hpp" -#include "../mwbase/luamanager.hpp" #include "../mwbase/scriptmanager.hpp" #include "../mwbase/windowmanager.hpp" #include "../mwbase/world.hpp" diff --git a/apps/openmw/mwscript/locals.cpp b/apps/openmw/mwscript/locals.cpp index f75ca40619..db5dda5204 100644 --- a/apps/openmw/mwscript/locals.cpp +++ b/apps/openmw/mwscript/locals.cpp @@ -9,7 +9,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/scriptmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/esmstore.hpp" diff --git a/apps/openmw/mwsound/regionsoundselector.cpp b/apps/openmw/mwsound/regionsoundselector.cpp index 388fe3bf91..8fda57596a 100644 --- a/apps/openmw/mwsound/regionsoundselector.cpp +++ b/apps/openmw/mwsound/regionsoundselector.cpp @@ -8,7 +8,6 @@ #include #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/esmstore.hpp" namespace MWSound diff --git a/apps/openmw/mwsound/sound_buffer.cpp b/apps/openmw/mwsound/sound_buffer.cpp index 29f1625439..a93cbdb6c8 100644 --- a/apps/openmw/mwsound/sound_buffer.cpp +++ b/apps/openmw/mwsound/sound_buffer.cpp @@ -1,7 +1,6 @@ #include "sound_buffer.hpp" #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "../mwworld/esmstore.hpp" #include diff --git a/apps/openmw/mwworld/actionapply.cpp b/apps/openmw/mwworld/actionapply.cpp index bf4fce38ce..b17205a79c 100644 --- a/apps/openmw/mwworld/actionapply.cpp +++ b/apps/openmw/mwworld/actionapply.cpp @@ -2,8 +2,6 @@ #include "class.hpp" -#include "../mwmechanics/actorutil.hpp" - namespace MWWorld { ActionApply::ActionApply(const Ptr& object, const ESM::RefId& id) diff --git a/apps/openmw/mwworld/actionread.cpp b/apps/openmw/mwworld/actionread.cpp index e621eb3836..3f48920dc0 100644 --- a/apps/openmw/mwworld/actionread.cpp +++ b/apps/openmw/mwworld/actionread.cpp @@ -6,7 +6,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/npcstats.hpp" diff --git a/apps/openmw/mwworld/actionsoulgem.cpp b/apps/openmw/mwworld/actionsoulgem.cpp index 74eda6bba5..ed642013f0 100644 --- a/apps/openmw/mwworld/actionsoulgem.cpp +++ b/apps/openmw/mwworld/actionsoulgem.cpp @@ -5,7 +5,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/windowmanager.hpp" -#include "../mwbase/world.hpp" #include "../mwmechanics/actorutil.hpp" diff --git a/apps/openmw/mwworld/datetimemanager.cpp b/apps/openmw/mwworld/datetimemanager.cpp index 2a347bd5ad..941f41d9e5 100644 --- a/apps/openmw/mwworld/datetimemanager.cpp +++ b/apps/openmw/mwworld/datetimemanager.cpp @@ -3,10 +3,8 @@ #include #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "duration.hpp" -#include "esmstore.hpp" #include "globals.hpp" #include "timestamp.hpp" diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp index e8204223aa..69cdb219af 100644 --- a/apps/openmw/mwworld/inventorystore.cpp +++ b/apps/openmw/mwworld/inventorystore.cpp @@ -6,7 +6,6 @@ #include #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "../mwmechanics/actorutil.hpp" #include "../mwmechanics/npcstats.hpp" diff --git a/apps/openmw/mwworld/livecellref.cpp b/apps/openmw/mwworld/livecellref.cpp index 30b413daae..1b14664ba2 100644 --- a/apps/openmw/mwworld/livecellref.cpp +++ b/apps/openmw/mwworld/livecellref.cpp @@ -9,7 +9,6 @@ #include "../mwbase/environment.hpp" #include "../mwbase/luamanager.hpp" -#include "../mwbase/world.hpp" #include "class.hpp" #include "esmstore.hpp" diff --git a/apps/openmw/mwworld/magiceffects.cpp b/apps/openmw/mwworld/magiceffects.cpp index 51c902a8f6..ec9d0029c5 100644 --- a/apps/openmw/mwworld/magiceffects.cpp +++ b/apps/openmw/mwworld/magiceffects.cpp @@ -11,7 +11,6 @@ #include #include "../mwbase/environment.hpp" -#include "../mwbase/world.hpp" #include "../mwmechanics/magiceffects.hpp" diff --git a/apps/openmw/mwworld/store.cpp b/apps/openmw/mwworld/store.cpp index 5afa92e53a..2b69ec82c4 100644 --- a/apps/openmw/mwworld/store.cpp +++ b/apps/openmw/mwworld/store.cpp @@ -14,9 +14,7 @@ #include #include -#include "../mwbase/environment.hpp" #include "../mwworld/cell.hpp" -#include "../mwworld/worldimp.hpp" namespace { diff --git a/components/config/gamesettings.cpp b/components/config/gamesettings.cpp index f82ea95266..42c11628df 100644 --- a/components/config/gamesettings.cpp +++ b/components/config/gamesettings.cpp @@ -1,5 +1,4 @@ #include "gamesettings.hpp" -#include "launchersettings.hpp" #include #include diff --git a/components/esm3/aisequence.hpp b/components/esm3/aisequence.hpp index 10e1b316eb..1e27a0afdd 100644 --- a/components/esm3/aisequence.hpp +++ b/components/esm3/aisequence.hpp @@ -5,7 +5,6 @@ #include #include -#include "components/esm/defs.hpp" #include "components/esm/refid.hpp" #include "components/esm/util.hpp" diff --git a/components/esm3/cellref.hpp b/components/esm3/cellref.hpp index 4ec9a26402..53f40ffab7 100644 --- a/components/esm3/cellref.hpp +++ b/components/esm3/cellref.hpp @@ -3,9 +3,7 @@ #include -#include "components/esm/common.hpp" #include "components/esm/defs.hpp" -#include "components/esm/esmcommon.hpp" #include "components/esm/refid.hpp" namespace ESM diff --git a/components/esm3/esmreader.cpp b/components/esm3/esmreader.cpp index ef8230ca2b..3e480b8f5e 100644 --- a/components/esm3/esmreader.cpp +++ b/components/esm3/esmreader.cpp @@ -1,7 +1,6 @@ #include "esmreader.hpp" #include "readerscache.hpp" -#include "savedgame.hpp" #include #include diff --git a/components/esm3/loadweap.hpp b/components/esm3/loadweap.hpp index bc2af28edd..6eec3a9ef4 100644 --- a/components/esm3/loadweap.hpp +++ b/components/esm3/loadweap.hpp @@ -4,7 +4,6 @@ #include #include "components/esm/refid.hpp" -#include "loadskil.hpp" namespace ESM { diff --git a/components/esm3/variant.cpp b/components/esm3/variant.cpp index f45fe262c4..3d5daa2cb3 100644 --- a/components/esm3/variant.cpp +++ b/components/esm3/variant.cpp @@ -5,8 +5,6 @@ #include "esmreader.hpp" #include "variantimp.hpp" -#include "components/esm/defs.hpp" - namespace ESM { namespace diff --git a/components/sceneutil/lightutil.cpp b/components/sceneutil/lightutil.cpp index 940c7c3ceb..9c0ebdf5c2 100644 --- a/components/sceneutil/lightutil.cpp +++ b/components/sceneutil/lightutil.cpp @@ -11,7 +11,6 @@ #include "lightcontroller.hpp" #include "lightmanager.hpp" -#include "util.hpp" #include "visitor.hpp" namespace diff --git a/components/settings/categories/hud.hpp b/components/settings/categories/hud.hpp index af2b28f447..e97a81501d 100644 --- a/components/settings/categories/hud.hpp +++ b/components/settings/categories/hud.hpp @@ -1,7 +1,6 @@ #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_HUD_H #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_HUD_H -#include "components/settings/sanitizerimpl.hpp" #include "components/settings/settingvalue.hpp" #include diff --git a/components/settings/categories/models.hpp b/components/settings/categories/models.hpp index 48f56e3bfa..fec8da7775 100644 --- a/components/settings/categories/models.hpp +++ b/components/settings/categories/models.hpp @@ -1,7 +1,6 @@ #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MODELS_H #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MODELS_H -#include "components/settings/sanitizerimpl.hpp" #include "components/settings/settingvalue.hpp" #include diff --git a/components/settings/categories/stereo.hpp b/components/settings/categories/stereo.hpp index 46814f9458..98fae8693f 100644 --- a/components/settings/categories/stereo.hpp +++ b/components/settings/categories/stereo.hpp @@ -1,7 +1,6 @@ #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREO_H #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREO_H -#include "components/settings/sanitizerimpl.hpp" #include "components/settings/settingvalue.hpp" #include