Merge branch 'settings_categories_includes' into 'master'

Cleanup settings categories includes See merge request OpenMW/openmw!3551
OpenMW · Nov 3, 2023 · f992d0d · f992d0d
2 parents d851eaa + 633fd89
commit f992d0d
Show file tree

Hide file tree

Showing 25 changed files with 49 additions and 51 deletions.
diff --git a/components/settings/categories/camera.hpp b/components/settings/categories/camera.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_CAMERA_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_CAMERA_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/cells.hpp b/components/settings/categories/cells.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_CELLS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_CELLS_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/fog.hpp b/components/settings/categories/fog.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_FOG_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_FOG_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/game.hpp b/components/settings/categories/game.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GAME_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GAME_H
 
-#include "components/detournavigator/collisionshapetype.hpp"
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/detournavigator/collisionshapetype.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/general.hpp b/components/settings/categories/general.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GENERAL_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GENERAL_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/groundcover.hpp b/components/settings/categories/groundcover.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GROUNDCOVER_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GROUNDCOVER_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/gui.hpp b/components/settings/categories/gui.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GUI_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_GUI_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/hud.hpp b/components/settings/categories/hud.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_HUD_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_HUD_H
 
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/input.hpp b/components/settings/categories/input.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_INPUT_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_INPUT_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/lua.hpp b/components/settings/categories/lua.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_LUA_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_LUA_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/map.hpp b/components/settings/categories/map.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MAP_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MAP_H
 
-#include "components/misc/constants.hpp"
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/misc/constants.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/models.hpp b/components/settings/categories/models.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MODELS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_MODELS_H
 
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/navigator.hpp b/components/settings/categories/navigator.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_NAVIGATOR_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_NAVIGATOR_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
 #include <components/settings/navmeshrendermode.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/physics.hpp b/components/settings/categories/physics.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_PHYSICS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_PHYSICS_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/postprocessing.hpp b/components/settings/categories/postprocessing.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_POSTPROCESSING_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_POSTPROCESSING_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/saves.hpp b/components/settings/categories/saves.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SAVES_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SAVES_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/shaders.hpp b/components/settings/categories/shaders.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SHADERS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SHADERS_H
 
-#include "components/sceneutil/lightingmethod.hpp"
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/sceneutil/lightingmethod.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/shadows.hpp b/components/settings/categories/shadows.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SHADOWS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SHADOWS_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/sound.hpp b/components/settings/categories/sound.hpp
@@ -1,9 +1,9 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SOUND_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_SOUND_H
 
-#include "components/settings/hrtfmode.hpp"
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/hrtfmode.hpp>
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <string>
 

diff --git a/components/settings/categories/stereo.hpp b/components/settings/categories/stereo.hpp
@@ -1,7 +1,7 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREO_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREO_H
 
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/stereoview.hpp b/components/settings/categories/stereoview.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREOVIEW_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_STEREOVIEW_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/terrain.hpp b/components/settings/categories/terrain.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_TERRAIN_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_TERRAIN_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/video.hpp b/components/settings/categories/video.hpp
@@ -1,13 +1,12 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_VIDEO_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_VIDEO_H
 
+#include <components/sdlutil/vsyncmode.hpp>
 #include <components/settings/sanitizerimpl.hpp>
 #include <components/settings/screenshotsettings.hpp>
 #include <components/settings/settingvalue.hpp>
 #include <components/settings/windowmode.hpp>
 
-#include <components/sdlutil/vsyncmode.hpp>
-
 #include <osg/Math>
 #include <osg/Vec2f>
 #include <osg/Vec3f>

diff --git a/components/settings/categories/water.hpp b/components/settings/categories/water.hpp
@@ -1,8 +1,8 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_WATER_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_WATER_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/sanitizerimpl.hpp>
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>

diff --git a/components/settings/categories/windows.hpp b/components/settings/categories/windows.hpp
@@ -1,8 +1,7 @@
 #ifndef OPENMW_COMPONENTS_SETTINGS_CATEGORIES_WINDOWS_H
 #define OPENMW_COMPONENTS_SETTINGS_CATEGORIES_WINDOWS_H
 
-#include "components/settings/sanitizerimpl.hpp"
-#include "components/settings/settingvalue.hpp"
+#include <components/settings/settingvalue.hpp>
 
 #include <osg/Math>
 #include <osg/Vec2f>