Merge branch 'internal_includes_openmw' into 'master'

Clean up some internal includes of the openmw component See merge request OpenMW/openmw!796
2025-01-30 06:15:32 +00:00 · 2021-05-07 10:53:25 +00:00 · 2021-05-07 10:53:25 +00:00 · 9b017ef04d
commit 9b017ef04d
parent d4dce30952 998cc97a4f
55 changed files with 0 additions and 78 deletions
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@ -25,7 +25,6 @@
 #include "../mwworld/failedaction.hpp"
 #include "../mwworld/customdata.hpp"
 #include "../mwworld/containerstore.hpp"
-#include "../mwphysics/physicssystem.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/localscripts.hpp"

--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@ -35,7 +35,6 @@
 #include "../mwworld/failedaction.hpp"
 #include "../mwworld/inventorystore.hpp"
 #include "../mwworld/customdata.hpp"
-#include "../mwphysics/physicssystem.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/localscripts.hpp"

--- a/apps/openmw/mwdialogue/journalimp.hpp
+++ b/apps/openmw/mwdialogue/journalimp.hpp
@ -3,7 +3,6 @@

 #include "../mwbase/journal.hpp"

-#include "journalentry.hpp"
 #include "quest.hpp"

 namespace MWDialogue
--- a/apps/openmw/mwgui/itemmodel.cpp
+++ b/apps/openmw/mwgui/itemmodel.cpp
@ -2,7 +2,6 @@

 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"
-#include "../mwworld/esmstore.hpp"

 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@ -12,7 +12,6 @@
 #include "../mwbase/soundmanager.hpp"

 #include "../mwworld/class.hpp"
-#include "../mwworld/cellstore.hpp"

 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/npcstats.hpp"
--- a/apps/openmw/mwgui/loadingscreen.cpp
+++ b/apps/openmw/mwgui/loadingscreen.cpp
@ -25,8 +25,6 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/inputmanager.hpp"

-#include "../mwrender/vismask.hpp"
-
 #include "backgroundimage.hpp"

 namespace MWGui
--- a/apps/openmw/mwgui/pickpocketitemmodel.cpp
+++ b/apps/openmw/mwgui/pickpocketitemmodel.cpp
@ -7,7 +7,6 @@
 #include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/pickpocket.hpp"

-#include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"

 #include "../mwbase/environment.hpp"
--- a/apps/openmw/mwgui/quickkeysmenu.hpp
+++ b/apps/openmw/mwgui/quickkeysmenu.hpp
@ -1,8 +1,6 @@
 #ifndef MWGUI_QUICKKEYS_H
 #define MWGUI_QUICKKEYS_H

-#include "../mwworld/ptr.hpp"
-
 #include "windowbase.hpp"

 #include "spellmodel.hpp"
--- a/apps/openmw/mwgui/recharge.cpp
+++ b/apps/openmw/mwgui/recharge.cpp
@ -15,7 +15,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"

-#include "../mwmechanics/creaturestats.hpp"
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/recharge.hpp"

--- a/apps/openmw/mwgui/spellwindow.hpp
+++ b/apps/openmw/mwgui/spellwindow.hpp
@ -2,7 +2,6 @@
 #define MWGUI_SPELLWINDOW_H

 #include "windowpinnablebase.hpp"
-#include "../mwworld/ptr.hpp"

 #include "spellmodel.hpp"

--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@ -26,7 +26,6 @@
 #include "containeritemmodel.hpp"
 #include "tradeitemmodel.hpp"
 #include "countdialog.hpp"
-#include "controllers.hpp"
 #include "tooltips.hpp"

 namespace
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@ -5,7 +5,6 @@
 #include <components/sdlutil/sdlinputwrapper.hpp>
 #include <components/esm/esmwriter.hpp>
 #include <components/esm/esmreader.hpp>
-#include <components/esm/controlsstate.hpp>

 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/environment.hpp"
--- a/apps/openmw/mwinput/keyboardmanager.hpp
+++ b/apps/openmw/mwinput/keyboardmanager.hpp
@ -1,7 +1,6 @@
 #ifndef MWINPUT_MWKEYBOARDMANAGER_H
 #define MWINPUT_MWKEYBOARDMANAGER_H

-#include <components/settings/settings.hpp>
 #include <components/sdlutil/events.hpp>

 namespace MWInput
--- a/apps/openmw/mwmechanics/activespells.hpp
+++ b/apps/openmw/mwmechanics/activespells.hpp
@ -5,7 +5,6 @@
 #include <vector>
 #include <string>

-#include <components/esm/defs.hpp>
 #include <components/esm/activespells.hpp>

 #include "../mwworld/timestamp.hpp"
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@ -40,7 +40,6 @@
 #include "aiwander.hpp"
 #include "actor.hpp"
 #include "summoning.hpp"
-#include "combat.hpp"
 #include "actorutil.hpp"
 #include "tickableeffects.hpp"

--- a/apps/openmw/mwmechanics/aicombat.hpp
+++ b/apps/openmw/mwmechanics/aicombat.hpp
@ -9,7 +9,6 @@

 #include "pathfinding.hpp"
 #include "movement.hpp"
-#include "obstacle.hpp"
 #include "aitimer.hpp"

 namespace ESM
--- a/apps/openmw/mwmechanics/aicombataction.hpp
+++ b/apps/openmw/mwmechanics/aicombataction.hpp
@ -3,8 +3,6 @@

 #include <memory>

-#include <components/esm/loadspel.hpp>
-
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/containerstore.hpp"

--- a/apps/openmw/mwmechanics/aifollow.hpp
+++ b/apps/openmw/mwmechanics/aifollow.hpp
@ -9,8 +9,6 @@

 #include "../mwworld/ptr.hpp"

-#include "pathfinding.hpp"
-
 namespace ESM
 {
 namespace AiSequence
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@ -2,7 +2,6 @@

 #include <components/esm/loadcell.hpp>
 #include <components/esm/loadland.hpp>
-#include <components/esm/loadmgef.hpp>
 #include <components/detournavigator/navigator.hpp>
 #include <components/misc/coordinateconverter.hpp>
 #include <components/settings/settings.hpp>
@ -15,8 +14,6 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/inventorystore.hpp"

-#include "../mwphysics/collisiontype.hpp"
-
 #include "pathgrid.hpp"
 #include "creaturestats.hpp"
 #include "movement.hpp"
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@ -8,7 +8,6 @@
 #include "../mwbase/world.hpp"

 #include "../mwworld/class.hpp"
-#include "../mwworld/action.hpp"

 #include "movement.hpp"
 #include "creaturestats.hpp"
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@ -11,7 +11,6 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
-#include "../mwbase/dialoguemanager.hpp"

 #include "../mwworld/class.hpp"
 #include "../mwworld/esmstore.hpp"
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@ -5,8 +5,6 @@

 #include <vector>

-#include "../mwworld/timestamp.hpp"
-
 #include "pathfinding.hpp"
 #include "obstacle.hpp"
 #include "aistate.hpp"
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@ -21,7 +21,6 @@
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
-#include "../mwworld/manualref.hpp"

 #include "magiceffects.hpp"
 #include "creaturestats.hpp"
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@ -3,8 +3,6 @@

 #include <deque>

-#include <components/esm/loadmgef.hpp>
-
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/containerstore.hpp"

--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@ -11,7 +11,6 @@

 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/mechanicsmanager.hpp"

 namespace MWMechanics
 {
--- a/apps/openmw/mwmechanics/pathfinding.cpp
+++ b/apps/openmw/mwmechanics/pathfinding.cpp
@ -3,7 +3,6 @@
 #include <iterator>
 #include <limits>

-#include <components/detournavigator/exceptions.hpp>
 #include <components/detournavigator/debug.hpp>
 #include <components/detournavigator/navigator.hpp>
 #include <components/debug/debuglog.hpp>
--- a/apps/openmw/mwmechanics/spellcasting.hpp
+++ b/apps/openmw/mwmechanics/spellcasting.hpp
@ -2,7 +2,6 @@
 #define MWMECHANICS_SPELLCASTING_H

 #include <components/esm/effectlist.hpp>
-#include <components/esm/loadmgef.hpp>

 #include "../mwworld/ptr.hpp"

--- a/apps/openmw/mwmechanics/spelllist.cpp
+++ b/apps/openmw/mwmechanics/spelllist.cpp
@ -3,7 +3,6 @@
 #include <algorithm>

 #include <components/esm/loadspel.hpp>
-#include <components/misc/rng.hpp>

 #include "spells.hpp"

--- a/apps/openmw/mwmechanics/spellpriority.cpp
+++ b/apps/openmw/mwmechanics/spellpriority.cpp
@ -17,7 +17,6 @@
 #include "creaturestats.hpp"
 #include "spellresistance.hpp"
 #include "weapontype.hpp"
-#include "combat.hpp"
 #include "summoning.hpp"
 #include "spellutil.hpp"

--- a/apps/openmw/mwmechanics/weaponpriority.cpp
+++ b/apps/openmw/mwmechanics/weaponpriority.cpp
@ -9,7 +9,6 @@
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/inventorystore.hpp"

-#include "npcstats.hpp"
 #include "combat.hpp"
 #include "aicombataction.hpp"
 #include "spellpriority.hpp"
--- a/apps/openmw/mwmechanics/weapontype.hpp
+++ b/apps/openmw/mwmechanics/weapontype.hpp
@ -3,8 +3,6 @@

 #include "../mwworld/inventorystore.hpp"

-#include "creaturestats.hpp"
-
 namespace MWMechanics
 {
    static std::map<int, ESM::WeaponType> sWeaponTypeList =
--- a/apps/openmw/mwphysics/actorconvexcallback.cpp
+++ b/apps/openmw/mwphysics/actorconvexcallback.cpp
@ -7,7 +7,6 @@
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <components/misc/convert.hpp>

-#include "collisiontype.hpp"
 #include "projectile.hpp"

 namespace MWPhysics
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@ -23,7 +23,6 @@
 #include <components/resource/bulletshapemanager.hpp>
 #include <components/debug/debuglog.hpp>
 #include <components/esm/loadgmst.hpp>
-#include <components/misc/constants.hpp>
 #include <components/sceneutil/positionattitudetransform.hpp>
 #include <components/sceneutil/unrefqueue.hpp>
 #include <components/misc/convert.hpp>
@ -56,7 +55,6 @@
 #include "closestnotmerayresultcallback.hpp"
 #include "contacttestresultcallback.hpp"
 #include "projectileconvexcallback.hpp"
-#include "constants.hpp"
 #include "movementsolver.hpp"
 #include "mtphysics.hpp"

--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@ -5,10 +5,7 @@

 #include <LinearMath/btVector3.h>

-#include <components/debug/debuglog.hpp>
 #include <components/misc/convert.hpp>
-#include <components/resource/bulletshape.hpp>
-#include <components/sceneutil/positionattitudetransform.hpp>

 #include "../mwworld/class.hpp"

--- a/apps/openmw/mwphysics/projectile.hpp
+++ b/apps/openmw/mwphysics/projectile.hpp
@ -6,8 +6,6 @@
 #include <mutex>
 #include <optional>

-#include "components/misc/convert.hpp"
-
 #include "ptrholder.hpp"

 class btCollisionObject;
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@ -11,7 +11,6 @@
 #include <components/resource/resourcesystem.hpp>
 #include <components/resource/scenemanager.hpp>

-#include <components/sceneutil/attach.hpp>
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/sceneutil/lightutil.hpp>
 #include <components/sceneutil/visitor.hpp>
--- a/apps/openmw/mwrender/actoranimation.hpp
+++ b/apps/openmw/mwrender/actoranimation.hpp
@ -6,7 +6,6 @@
 #include <osg/ref_ptr>

 #include "../mwworld/containerstore.hpp"
-#include "../mwworld/inventorystore.hpp"

 #include "animation.hpp"

--- a/apps/openmw/mwrender/characterpreview.cpp
+++ b/apps/openmw/mwrender/characterpreview.cpp
@ -23,7 +23,6 @@
 #include <components/sceneutil/shadow.hpp>
 #include <components/settings/settings.hpp>

-#include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@ -9,7 +9,6 @@

 #include <osgDB/WriteFile>

-#include <components/loadinglistener/loadinglistener.hpp>
 #include <components/settings/settings.hpp>
 #include <components/files/memorystream.hpp>

--- a/apps/openmw/mwrender/landmanager.hpp
+++ b/apps/openmw/mwrender/landmanager.hpp
@ -3,7 +3,6 @@

 #include <osg/Object>

-#include <components/resource/objectcache.hpp>
 #include <components/resource/resourcemanager.hpp>
 #include <components/esmterrain/storage.hpp>

--- a/apps/openmw/mwrender/localmap.cpp
+++ b/apps/openmw/mwrender/localmap.cpp
@ -22,7 +22,6 @@
 #include <components/sceneutil/lightmanager.hpp>
 #include <components/files/memorystream.hpp>
 #include <components/resource/scenemanager.hpp>
-#include <components/resource/resourcesystem.hpp>

 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
--- a/apps/openmw/mwrender/recastmesh.cpp
+++ b/apps/openmw/mwrender/recastmesh.cpp
@ -1,7 +1,6 @@
 #include "recastmesh.hpp"

 #include <components/sceneutil/recastmesh.hpp>
-#include <components/debug/debuglog.hpp>

 #include <osg/PositionAttitudeTransform>

--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@ -43,14 +43,12 @@
 #include <components/terrain/quadtreeworld.hpp>

 #include <components/esm/loadcell.hpp>
-#include <components/fallback/fallback.hpp>

 #include <components/detournavigator/navigator.hpp>

 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwgui/loadingscreen.hpp"
-#include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwmechanics/actorutil.hpp"

@ -63,7 +61,6 @@
 #include "viewovershoulder.hpp"
 #include "water.hpp"
 #include "terrainstorage.hpp"
-#include "util.hpp"
 #include "navmesh.hpp"
 #include "actorspaths.hpp"
 #include "recastmesh.hpp"
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@ -46,7 +46,6 @@
 #include <components/sceneutil/shadow.hpp>

 #include <components/settings/settings.hpp>
-#include <components/misc/stringops.hpp>

 #include <components/nifosg/particle.hpp>

--- a/apps/openmw/mwscript/cellextensions.cpp
+++ b/apps/openmw/mwscript/cellextensions.cpp
@ -13,7 +13,6 @@
 #include "../mwworld/actionteleport.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwbase/environment.hpp"
-#include "../mwworld/player.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
--- a/apps/openmw/mwscript/controlextensions.cpp
+++ b/apps/openmw/mwscript/controlextensions.cpp
@ -1,6 +1,5 @@
 #include "controlextensions.hpp"

-#include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>

 #include <components/interpreter/interpreter.hpp>
@ -15,8 +14,6 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/ptr.hpp"

-#include "../mwmechanics/npcstats.hpp"
-
 #include "interpretercontext.hpp"
 #include "ref.hpp"

--- a/apps/openmw/mwscript/globalscripts.cpp
+++ b/apps/openmw/mwscript/globalscripts.cpp
@ -12,8 +12,6 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/scriptmanager.hpp"

-#include "../mwmechanics/creaturestats.hpp"
-
 #include "interpretercontext.hpp"

 namespace
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@ -5,8 +5,6 @@

 #include <components/compiler/locals.hpp>

-#include <components/esm/cellid.hpp>
-
 #include "../mwworld/esmstore.hpp"

 #include "../mwbase/environment.hpp"
--- a/apps/openmw/mwstate/quicksavemanager.hpp
+++ b/apps/openmw/mwstate/quicksavemanager.hpp
@ -4,7 +4,6 @@
 #include <string>

 #include "character.hpp"
-#include "../mwbase/statemanager.hpp"

 namespace MWState{
    class QuickSaveManager{
--- a/apps/openmw/mwworld/cellpreloader.cpp
+++ b/apps/openmw/mwworld/cellpreloader.cpp
@ -15,13 +15,9 @@
 #include <components/sceneutil/unrefqueue.hpp>
 #include <components/esm/loadcell.hpp>

-#include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
-
 #include "../mwrender/landmanager.hpp"

 #include "cellstore.hpp"
-#include "manualref.hpp"
 #include "class.hpp"

 namespace MWWorld
--- a/apps/openmw/mwworld/failedaction.cpp
+++ b/apps/openmw/mwworld/failedaction.cpp
@ -1,5 +1,4 @@
 #include "failedaction.hpp"
-#include "../mwbase/world.hpp"

 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
--- a/apps/openmw/mwworld/globals.hpp
+++ b/apps/openmw/mwworld/globals.hpp
@ -7,7 +7,6 @@

 #include <stdint.h>

-#include <components/interpreter/types.hpp>
 #include <components/esm/loadglob.hpp>

 namespace ESM
--- a/apps/openmw/mwworld/projectilemanager.cpp
+++ b/apps/openmw/mwworld/projectilemanager.cpp
@ -44,7 +44,6 @@

 #include "../mwsound/sound.hpp"

-#include "../mwphysics/collisiontype.hpp"
 #include "../mwphysics/physicssystem.hpp"
 #include "../mwphysics/projectile.hpp"

--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@ -26,8 +26,6 @@
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/windowmanager.hpp"

-#include "../mwmechanics/actorutil.hpp"
-
 #include "../mwrender/renderingmanager.hpp"
 #include "../mwrender/landmanager.hpp"

--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@ -4,7 +4,6 @@
 #include <osg/ref_ptr>

 #include <components/settings/settings.hpp>
-#include <components/fallback/fallback.hpp>

 #include "../mwbase/world.hpp"