Merge branch 'rm_unused_apps_includes' into 'master'

Use "" to quote apps/openmw includes and remove unused See merge request OpenMW/openmw!3727
2025-02-20 15:40:32 +00:00 · 2024-01-09 08:59:23 +00:00 · 2024-01-09 08:59:23 +00:00 · a0c0509e3f
commit a0c0509e3f
parent 5bd2020c23 067957f57b
36 changed files with 58 additions and 84 deletions
--- a/apps/launcher/utils/openalutil.cpp
+++ b/apps/launcher/utils/openalutil.cpp
@ -1,7 +1,7 @@
 #include <cstring>
 #include <vector>

-#include <apps/openmw/mwsound/alext.h>
+#include "apps/openmw/mwsound/alext.h"

 #include "openalutil.hpp"

--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@ -9,7 +9,6 @@
 #include <fstream>
 #include <regex>

-#include <apps/openmw/mwgui/textcolours.hpp>
 #include <components/compiler/exception.hpp>
 #include <components/compiler/extensions0.hpp>
 #include <components/compiler/lineparser.hpp>
@ -20,6 +19,8 @@
 #include <components/misc/utf8stream.hpp>
 #include <components/settings/values.hpp>

+#include "apps/openmw/mwgui/textcolours.hpp"
+
 #include "../mwscript/extensions.hpp"
 #include "../mwscript/interpretercontext.hpp"

--- a/apps/openmw/mwlua/cellbindings.cpp
+++ b/apps/openmw/mwlua/cellbindings.cpp
@ -43,6 +43,8 @@
 #include <components/esm4/loadtree.hpp>
 #include <components/esm4/loadweap.hpp>

+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/worldmodel.hpp"

--- a/apps/openmw/mwlua/luabindings.cpp
+++ b/apps/openmw/mwlua/luabindings.cpp
@ -21,6 +21,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/statemanager.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/world.hpp"
 #include "../mwworld/action.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/datetimemanager.hpp"
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@ -21,11 +21,13 @@
 #include <components/lua_ui/util.hpp>

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

 #include "../mwrender/postprocessor.hpp"

 #include "../mwworld/datetimemanager.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/player.hpp"
 #include "../mwworld/ptr.hpp"
 #include "../mwworld/scene.hpp"
 #include "../mwworld/worldmodel.hpp"
--- a/apps/openmw/mwlua/objectbindings.cpp
+++ b/apps/openmw/mwlua/objectbindings.cpp
@ -20,6 +20,9 @@

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

+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
 #include "luaevents.hpp"
 #include "luamanagerimp.hpp"
 #include "types/types.hpp"
--- a/apps/openmw/mwlua/types/activator.cpp
+++ b/apps/openmw/mwlua/types/activator.cpp
@ -5,10 +5,6 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
-
 namespace sol
 {
    template <>
--- a/apps/openmw/mwlua/types/actor.cpp
+++ b/apps/openmw/mwlua/types/actor.cpp
@ -6,8 +6,10 @@
 #include <components/lua/luastate.hpp>
 #include <components/settings/values.hpp>

+#include "apps/openmw/mwbase/environment.hpp"
 #include "apps/openmw/mwbase/mechanicsmanager.hpp"
 #include "apps/openmw/mwbase/windowmanager.hpp"
+#include "apps/openmw/mwbase/world.hpp"
 #include "apps/openmw/mwmechanics/actorutil.hpp"
 #include "apps/openmw/mwmechanics/creaturestats.hpp"
 #include "apps/openmw/mwmechanics/drawstate.hpp"
--- a/apps/openmw/mwlua/types/actor.hpp
+++ b/apps/openmw/mwlua/types/actor.hpp
@ -4,16 +4,15 @@
 #include <sol/sol.hpp>

 #include <components/esm/defs.hpp>
-#include <components/lua/luastate.hpp>
-
-#include "apps/openmw/mwworld/esmstore.hpp"
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
 #include <components/esm3/loadclas.hpp>
 #include <components/esm3/loadnpc.hpp>
+#include <components/lua/luastate.hpp>
+
+#include "apps/openmw/mwbase/environment.hpp"
+#include "apps/openmw/mwworld/esmstore.hpp"

 #include "../context.hpp"
-#include "../object.hpp"
+
 namespace MWLua
 {

--- a/apps/openmw/mwlua/types/apparatus.cpp
+++ b/apps/openmw/mwlua/types/apparatus.cpp
@ -5,9 +5,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"

 namespace sol
 {
--- a/apps/openmw/mwlua/types/armor.cpp
+++ b/apps/openmw/mwlua/types/armor.cpp
@ -5,9 +5,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"

 namespace sol
 {
--- a/apps/openmw/mwlua/types/book.cpp
+++ b/apps/openmw/mwlua/types/book.cpp
@ -4,14 +4,12 @@
 #include <components/misc/strings/lower.hpp>

 #include <components/esm3/loadbook.hpp>
+#include <components/esm3/loadskil.hpp>
 #include <components/lua/luastate.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
-#include <components/esm3/loadskil.hpp>
+#include "apps/openmw/mwbase/environment.hpp"

 namespace sol
 {
--- a/apps/openmw/mwlua/types/clothing.cpp
+++ b/apps/openmw/mwlua/types/clothing.cpp
@ -5,9 +5,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"

 namespace sol
 {
--- a/apps/openmw/mwlua/types/container.cpp
+++ b/apps/openmw/mwlua/types/container.cpp
@ -5,7 +5,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwworld/class.hpp>
+#include "apps/openmw/mwworld/class.hpp"

 namespace sol
 {
--- a/apps/openmw/mwlua/types/creature.cpp
+++ b/apps/openmw/mwlua/types/creature.cpp
@ -6,10 +6,6 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
-
 namespace sol
 {
    template <>
--- a/apps/openmw/mwlua/types/door.cpp
+++ b/apps/openmw/mwlua/types/door.cpp
@ -7,7 +7,6 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include "apps/openmw/mwworld/esmstore.hpp"
 #include "apps/openmw/mwworld/worldmodel.hpp"

 namespace sol
--- a/apps/openmw/mwlua/types/ingredient.cpp
+++ b/apps/openmw/mwlua/types/ingredient.cpp
@ -6,10 +6,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwworld/esmstore.hpp>
-
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
+#include "apps/openmw/mwbase/environment.hpp"

 namespace sol
 {
--- a/apps/openmw/mwlua/types/light.cpp
+++ b/apps/openmw/mwlua/types/light.cpp
@ -5,9 +5,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"

 namespace sol
 {
--- a/apps/openmw/mwlua/types/lockable.cpp
+++ b/apps/openmw/mwlua/types/lockable.cpp
@ -1,11 +1,11 @@
-
 #include "types.hpp"
+
 #include <components/esm3/loadmisc.hpp>
 #include <components/esm3/loadspel.hpp>
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwworld/esmstore.hpp"

 namespace MWLua
 {
--- a/apps/openmw/mwlua/types/lockpick.cpp
+++ b/apps/openmw/mwlua/types/lockpick.cpp
@ -5,9 +5,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"

 namespace sol
 {
--- a/apps/openmw/mwlua/types/misc.cpp
+++ b/apps/openmw/mwlua/types/misc.cpp
@ -6,9 +6,8 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
+#include "apps/openmw/mwworld/esmstore.hpp"

 namespace sol
 {
--- a/apps/openmw/mwlua/types/npc.cpp
+++ b/apps/openmw/mwlua/types/npc.cpp
@ -5,12 +5,12 @@
 #include <components/esm3/loadnpc.hpp>
 #include <components/lua/luastate.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/mechanicsmanager.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwmechanics/npcstats.hpp>
-#include <apps/openmw/mwworld/class.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
+#include "apps/openmw/mwbase/mechanicsmanager.hpp"
+#include "apps/openmw/mwbase/world.hpp"
+#include "apps/openmw/mwmechanics/npcstats.hpp"
+#include "apps/openmw/mwworld/class.hpp"
+#include "apps/openmw/mwworld/esmstore.hpp"

 #include "../classbindings.hpp"
 #include "../localscripts.hpp"
--- a/apps/openmw/mwlua/types/player.cpp
+++ b/apps/openmw/mwlua/types/player.cpp
@ -1,12 +1,13 @@
 #include "types.hpp"

 #include "../luamanagerimp.hpp"
-#include <apps/openmw/mwbase/inputmanager.hpp>
-#include <apps/openmw/mwbase/journal.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwmechanics/npcstats.hpp>
-#include <apps/openmw/mwworld/class.hpp>
-#include <apps/openmw/mwworld/globals.hpp>
+
+#include "apps/openmw/mwbase/inputmanager.hpp"
+#include "apps/openmw/mwbase/journal.hpp"
+#include "apps/openmw/mwbase/world.hpp"
+#include "apps/openmw/mwmechanics/npcstats.hpp"
+#include "apps/openmw/mwworld/class.hpp"
+#include "apps/openmw/mwworld/globals.hpp"

 namespace MWLua
 {
--- a/apps/openmw/mwlua/types/potion.cpp
+++ b/apps/openmw/mwlua/types/potion.cpp
@ -5,9 +5,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"

 namespace sol
 {
--- a/apps/openmw/mwlua/types/probe.cpp
+++ b/apps/openmw/mwlua/types/probe.cpp
@ -5,9 +5,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"

 namespace sol
 {
--- a/apps/openmw/mwlua/types/repair.cpp
+++ b/apps/openmw/mwlua/types/repair.cpp
@ -5,7 +5,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
+#include "apps/openmw/mwbase/environment.hpp"

 namespace sol
 {
--- a/apps/openmw/mwlua/types/static.cpp
+++ b/apps/openmw/mwlua/types/static.cpp
@ -5,10 +5,6 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
-
 namespace sol
 {
    template <>
--- a/apps/openmw/mwlua/types/types.hpp
+++ b/apps/openmw/mwlua/types/types.hpp
@ -7,7 +7,6 @@
 #include <components/lua/luastate.hpp>

 #include "apps/openmw/mwbase/environment.hpp"
-#include "apps/openmw/mwbase/world.hpp"
 #include "apps/openmw/mwworld/esmstore.hpp"
 #include "apps/openmw/mwworld/store.hpp"

--- a/apps/openmw/mwlua/types/weapon.cpp
+++ b/apps/openmw/mwlua/types/weapon.cpp
@ -5,9 +5,7 @@
 #include <components/misc/resourcehelpers.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"

 namespace sol
 {
@ -16,7 +14,6 @@ namespace sol
    {
    };
 }
-#include <components/resource/resourcesystem.hpp>

 namespace
 {
--- a/apps/openmw/mwlua/worker.cpp
+++ b/apps/openmw/mwlua/worker.cpp
@ -2,7 +2,7 @@

 #include "luamanagerimp.hpp"

-#include <apps/openmw/profile.hpp>
+#include "apps/openmw/profile.hpp"

 #include <components/debug/debuglog.hpp>
 #include <components/settings/values.hpp>
--- a/apps/openmw/mwrender/actorspaths.hpp
+++ b/apps/openmw/mwrender/actorspaths.hpp
@ -1,7 +1,7 @@
 #ifndef OPENMW_MWRENDER_AGENTSPATHS_H
 #define OPENMW_MWRENDER_AGENTSPATHS_H

-#include <apps/openmw/mwworld/ptr.hpp>
+#include "apps/openmw/mwworld/ptr.hpp"

 #include <osg/ref_ptr>

--- a/apps/openmw/mwrender/fogmanager.cpp
+++ b/apps/openmw/mwrender/fogmanager.cpp
@ -9,7 +9,7 @@
 #include <components/sceneutil/util.hpp>
 #include <components/settings/values.hpp>

-#include <apps/openmw/mwworld/cell.hpp>
+#include "apps/openmw/mwworld/cell.hpp"

 namespace MWRender
 {
--- a/apps/openmw/mwworld/cellref.cpp
+++ b/apps/openmw/mwworld/cellref.cpp
@ -8,10 +8,10 @@
 #include <components/esm3/objectstate.hpp>
 #include <components/esm4/loadrefr.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwmechanics/spellutil.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
+#include "apps/openmw/mwbase/environment.hpp"
+#include "apps/openmw/mwbase/world.hpp"
+#include "apps/openmw/mwmechanics/spellutil.hpp"
+#include "apps/openmw/mwworld/esmstore.hpp"

 namespace MWWorld
 {
--- a/apps/openmw/mwworld/groundcoverstore.cpp
+++ b/apps/openmw/mwworld/groundcoverstore.cpp
@ -9,8 +9,6 @@
 #include <components/misc/strings/lower.hpp>
 #include <components/resource/resourcesystem.hpp>

-#include <apps/openmw/mwbase/environment.hpp>
-
 #include "store.hpp"

 namespace MWWorld
--- a/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
+++ b/apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
@ -1,4 +1,5 @@
 #include "apps/openmw/mwdialogue/keywordsearch.hpp"
+
 #include <gtest/gtest.h>

 struct KeywordSearchTest : public ::testing::Test
--- a/apps/openmw_test_suite/openmw/options.cpp
+++ b/apps/openmw_test_suite/openmw/options.cpp
@ -1,4 +1,5 @@
-#include <apps/openmw/options.hpp>
+#include "apps/openmw/options.hpp"
+
 #include <components/files/configurationmanager.hpp>
 #include <components/files/conversion.hpp>