Migrate relative includes in headers to #include <>

diff --git a/qcsrc/common/command/generic.qh b/qcsrc/common/command/generic.qh
index 63e1dce83b9bfbabbf3b0a4aa0a779b622c6dd98..f8139aaf47e4a894bb803645628683b1168d5c96 100644 (file)
--- a/qcsrc/common/command/generic.qh
+++ b/qcsrc/common/command/generic.qh
@@ -1,7 +1,7 @@
 #ifndef COMMAND_GENERIC_H
 #define COMMAND_GENERIC_H
 
-#include "../constants.qh"
+#include <common/constants.qh>
 
 // =========================================================
 //  Declarations for common command code, written by Samual

diff --git a/qcsrc/common/deathtypes/all.qh b/qcsrc/common/deathtypes/all.qh
index ae40ed811159b97b22db510bf46b6eda04e5a152..903087947416dfe6978a24900a72020fa3af3354 100644 (file)
--- a/qcsrc/common/deathtypes/all.qh
+++ b/qcsrc/common/deathtypes/all.qh
@@ -1,7 +1,7 @@
 #ifndef DEATHTYPES_ALL_H
 #define DEATHTYPES_ALL_H
 
-#include "../notifications/all.qh"
+#include <common/notifications/all.qh>
 
 REGISTRY(Deathtypes, BITS(8))
 #define Deathtypes_from(i) _Deathtypes_from(i, NULL)

diff --git a/qcsrc/common/items/all.qh b/qcsrc/common/items/all.qh
index eea1de9a4a7e3b1ce75694eafdbdcb9bd274b1ba..ba8d86bfaab2cf71b037efcb798758c09b0d8bfe 100644 (file)
--- a/qcsrc/common/items/all.qh
+++ b/qcsrc/common/items/all.qh
@@ -1,7 +1,7 @@
 #ifndef ITEMS_ALL_H
 #define ITEMS_ALL_H
 
-#include "../command/all.qh"
+#include <common/command/all.qh>
 
 #include "item.qh"
 

diff --git a/qcsrc/common/items/item/pickup.qh b/qcsrc/common/items/item/pickup.qh
index dbc74a0625621bee288da55c946ebbfaf6ab4704..9bee4e6b2422d19ccd9c36810c4ca36a3cee23c8 100644 (file)
--- a/qcsrc/common/items/item/pickup.qh
+++ b/qcsrc/common/items/item/pickup.qh
@@ -1,7 +1,7 @@
 #ifndef PICKUP_H
 #define PICKUP_H
-#include "../inventory.qh"
-#include "../item.qh"
+#include <common/items/inventory.qh>
+#include <common/items/item.qh>
 CLASS(Pickup, GameItem)
 #ifndef MENUQC
     ATTRIB(Pickup, m_model, Model, NULL)

diff --git a/qcsrc/common/minigames/minigame/all.qh b/qcsrc/common/minigames/minigame/all.qh
index 5567b25681d4522cd38d3b9859ef70fdb80cd0ad..74df391de2cc7091c518ebe7c39a9551c1f711af 100644 (file)
--- a/qcsrc/common/minigames/minigame/all.qh
+++ b/qcsrc/common/minigames/minigame/all.qh
@@ -1,9 +1,9 @@
 #pragma once
 
 #if defined(SVQC)
-#include "../sv_minigames.qh"
+#include <common/minigames/sv_minigames.qh>
 #elif defined(CSQC)
-#include "../cl_minigames.qh"
+#include <common/minigames/cl_minigames.qh>
 #endif
 
 /**

diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh
index 7c29df469bdfce1e4a7596bbff0b642df4e9a782..a3cb49ed2c71d3b513276ab7e6e64a34941fcaf6 100644 (file)
--- a/qcsrc/common/stats.qh
+++ b/qcsrc/common/stats.qh
@@ -2,7 +2,7 @@
 #define STATS_H
 
 #ifdef SVQC
-#include "../server/cl_client.qh"
+#include <server/cl_client.qh>
 #endif
 
 // Full list of all stat constants, included in a single location for easy reference

diff --git a/qcsrc/common/turrets/all.qh b/qcsrc/common/turrets/all.qh
index 29e1fb5a66aed5db580e1fa606a93b1c701f715c..16bfacf3c8caf64439f68c08ea2936914f1c66c6 100644 (file)
--- a/qcsrc/common/turrets/all.qh
+++ b/qcsrc/common/turrets/all.qh
@@ -1,7 +1,7 @@
 #ifndef TURRETS_ALL_H
 #define TURRETS_ALL_H
 
-#include "../command/all.qh"
+#include <common/command/all.qh>
 #include "config.qh"
 
 #include "turret.qh"

diff --git a/qcsrc/common/turrets/turret.qh b/qcsrc/common/turrets/turret.qh
index 9e315e271aeef05864d8f55d0be42261dd62f426..5ac3c2ef6446cbdc865f6d3a0d774edc2ab96f8f 100644 (file)
--- a/qcsrc/common/turrets/turret.qh
+++ b/qcsrc/common/turrets/turret.qh
@@ -1,7 +1,7 @@
 #ifndef TURRET_H
 #define TURRET_H
 
-#include "../weapons/all.qh"
+#include <common/weapons/all.qh>
 
 CLASS(Turret, Object)
     ATTRIB(Turret, m_id, int, 0)

diff --git a/qcsrc/common/vehicles/sv_vehicles.qh b/qcsrc/common/vehicles/sv_vehicles.qh
index 289997e5d26fb0d6052133902707f1704220d870..e9a4d3f39e42faa222e2e4f38bab7355513c06c6 100644 (file)
--- a/qcsrc/common/vehicles/sv_vehicles.qh
+++ b/qcsrc/common/vehicles/sv_vehicles.qh
@@ -2,7 +2,7 @@
 #define VEHICLES_DEF_H
 #ifdef SVQC
 
-#include "../turrets/sv_turrets.qh"
+#include <common/turrets/sv_turrets.qh>
 
 // vehicle cvars
 bool autocvar_g_vehicles = true;

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 5e87a3c3a9cbe4ee132921a0d25fcc1698edbf0e..6f380ececbe0d3fda50c7b7a20081c08f41f4e82 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -1,8 +1,8 @@
 #ifndef WEAPONS_ALL_H
 #define WEAPONS_ALL_H
 
-#include "../command/all.qh"
-#include "../stats.qh"
+#include <common/command/all.qh>
+#include <common/stats.qh>
 #include "config.qh"
 
 // weapon sets
@@ -24,7 +24,7 @@ WepSet ReadWepSet();
 #include <common/models/all.qh>
 #endif
 
-#include "../util.qh"
+#include <common/util.qh>
 
 #ifdef SVQC
 #include <server/bot/aim.qh>

diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh
index 4a12dee270e0189597058f49ef1fa1e43c2754fe..bd5172bdace8100137285939c321c58a02306017 100644 (file)
--- a/qcsrc/common/weapons/weapon.qh
+++ b/qcsrc/common/weapons/weapon.qh
@@ -1,7 +1,7 @@
 #ifndef WEAPON_H
 #define WEAPON_H
-#include "../items/item/pickup.qh"
-#include "../stats.qh"
+#include <common/items/item/pickup.qh>
+#include <common/stats.qh>
 
 const int MAX_WEAPONSLOTS = 2;
 .entity weaponentities[MAX_WEAPONSLOTS];
@@ -126,7 +126,7 @@ CLASS(Weapon, Object)
        }
 ENDCLASS(Weapon)
 
-#include "../items/all.qh"
+#include <common/items/all.qh>
 CLASS(WeaponPickup, Pickup)
     ATTRIB(WeaponPickup, m_weapon, Weapon, NULL)
     ATTRIB(WeaponPickup, m_name, string, string_null)

diff --git a/qcsrc/menu/menu.qh b/qcsrc/menu/menu.qh
index 8bc24a16ecb89e544ef32d14cffde4fd27afbf0c..2df331950848c1dcdab9c53b63d9ebd553a3cb9a 100644 (file)
--- a/qcsrc/menu/menu.qh
+++ b/qcsrc/menu/menu.qh
@@ -5,8 +5,8 @@
 
 #include "xonotic/util.qh"
 
-#include "../common/constants.qh"
-#include "../common/util.qh"
+#include <common/constants.qh>
+#include <common/util.qh>
 
 const int GAME_ISSERVER     = BIT(0);
 const int GAME_CONNECTED    = BIT(1);

diff --git a/qcsrc/server/cheats.qh b/qcsrc/server/cheats.qh
index 03b5ac8dd527d7a66b8adff8f1f6f887efcdc1fb..97df2467bd207013cc8dbbe1cc7fc2fc853f0b02 100644 (file)
--- a/qcsrc/server/cheats.qh
+++ b/qcsrc/server/cheats.qh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../common/impulses/all.qh"
+#include <common/impulses/all.qh>
 
 //float autocvar_sv_cheats; // must... declare... global
 

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index 245719b32101e4ad4c0c3d7433ca4ffb0999bfa6..8139325f9ce6512ac20f04d749f89ef3f9f37aa1 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../common/weapons/all.qh"
-#include "../common/stats.qh"
+#include <common/weapons/all.qh>
+#include <common/stats.qh>
 
 #define INDEPENDENT_ATTACK_FINISHED 1
 

diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh
index be570eb7fbe3af5287291096e80ff6af81887433..38094ef95d85c63e21fbb44c07c79abb9f4b74af 100644 (file)
--- a/qcsrc/server/g_damage.qh
+++ b/qcsrc/server/g_damage.qh
@@ -3,25 +3,25 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include "../lib/warpzone/common.qh"
-    #include "../common/constants.qh"
-    #include "../common/teams.qh"
-    #include "../common/util.qh"
-    #include "../common/weapons/all.qh"
+    #include <lib/warpzone/common.qh>
+    #include <common/constants.qh>
+    #include <common/teams.qh>
+    #include <common/util.qh>
+    #include <common/weapons/all.qh>
     #include "weapons/accuracy.qh"
     #include "weapons/csqcprojectile.qh"
     #include "weapons/selection.qh"
-    #include "../common/t_items.qh"
+    #include <common/t_items.qh>
     #include "autocvars.qh"
     #include "constants.qh"
     #include "defs.qh"
-    #include "../common/notifications/all.qh"
-    #include "../common/deathtypes/all.qh"
+    #include <common/notifications/all.qh>
+    #include <common/deathtypes/all.qh>
     #include "mutators/all.qh"
-    #include "../common/turrets/sv_turrets.qh"
-    #include "../common/vehicles/all.qh"
-    #include "../lib/csqcmodel/sv_model.qh"
-    #include "../common/playerstats.qh"
+    #include <common/turrets/sv_turrets.qh>
+    #include <common/vehicles/all.qh>
+    #include <lib/csqcmodel/sv_model.qh>
+    #include <common/playerstats.qh>
     #include "g_hook.qh"
     #include "scores.qh"
     #include "spawnpoints.qh"

diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh
index f87860f8f132a7267a68ab6ca8d69412b722c111..dd93aa329d8ea194249f4d260e04ed0854608d99 100644 (file)
--- a/qcsrc/server/miscfunctions.qh
+++ b/qcsrc/server/miscfunctions.qh
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "../common/t_items.qh"
+#include <common/t_items.qh>
 
 #include "mutators/events.qh"
 
-#include "../common/constants.qh"
-#include "../common/mapinfo.qh"
-#include "../common/turrets/all.qh"
+#include <common/constants.qh>
+#include <common/mapinfo.qh>
+#include <common/turrets/all.qh>
 
 #ifdef RELEASE
 #define cvar_string_normal builtin_cvar_string

diff --git a/qcsrc/server/mutators/gamemode.qh b/qcsrc/server/mutators/gamemode.qh
index de3a215fe9d3a819dd00806d78e047c8f4980270..bec3ca98c3f49c3090a3e61d0ff74bdd72990136 100644 (file)
--- a/qcsrc/server/mutators/gamemode.qh
+++ b/qcsrc/server/mutators/gamemode.qh
@@ -1,30 +1,30 @@
 #pragma once
 
-#include "../cl_client.qh"
-#include "../cl_player.qh"
-#include "../cl_impulse.qh"
-#include "../cheats.qh"
-#include "../g_damage.qh"
-#include "../round_handler.qh"
-#include "../scores.qh"
-#include "../scores_rules.qh"
-#include "../teamplay.qh"
+#include <server/cl_client.qh>
+#include <server/cl_player.qh>
+#include <server/cl_impulse.qh>
+#include <server/cheats.qh>
+#include <server/g_damage.qh>
+#include <server/round_handler.qh>
+#include <server/scores.qh>
+#include <server/scores_rules.qh>
+#include <server/teamplay.qh>
 
-#include "../bot/bot.qh"
-#include "../bot/navigation.qh"
-#include "../bot/waypoints.qh"
-#include "../bot/havocbot/roles.qh"
+#include <server/bot/bot.qh>
+#include <server/bot/navigation.qh>
+#include <server/bot/waypoints.qh>
+#include <server/bot/havocbot/roles.qh>
 
-#include "../bot/havocbot/havocbot.qh"
+#include <server/bot/havocbot/havocbot.qh>
 
-#include "../command/vote.qh"
+#include <server/command/vote.qh>
 
 #include <common/monsters/all.qh>
 
-#include "../command/common.qh"
+#include <server/command/common.qh>
 
-#include "../weapons/tracing.qh"
-#include "../weapons/weaponsystem.qh"
+#include <server/weapons/tracing.qh>
+#include <server/weapons/weaponsystem.qh>
 
 #include <common/deathtypes/all.qh>
 #include <common/notifications/all.qh>

diff --git a/qcsrc/server/mutators/mutator.qh b/qcsrc/server/mutators/mutator.qh
index 636efab13924c0a9bcdbcdc4199832909e8d1cff..40fad29b34426e03fae679d508eab6968ca327ba 100644 (file)
--- a/qcsrc/server/mutators/mutator.qh
+++ b/qcsrc/server/mutators/mutator.qh
@@ -2,29 +2,29 @@
 
 #include <common/mutators/base.qh>
 
-#include "../cl_client.qh"
-#include "../cl_player.qh"
-#include "../cl_impulse.qh"
-#include "../cheats.qh"
-#include "../g_damage.qh"
-#include "../round_handler.qh"
-#include "../scores.qh"
-#include "../scores_rules.qh"
-
-#include "../bot/bot.qh"
-#include "../bot/navigation.qh"
-#include "../bot/waypoints.qh"
-
-#include "../bot/havocbot/havocbot.qh"
-#include "../bot/havocbot/roles.qh"
-
-#include "../command/vote.qh"
-#include "../command/common.qh"
-
-#include "../weapons/common.qh"
-#include "../weapons/tracing.qh"
-#include "../weapons/throwing.qh"
-#include "../weapons/weaponsystem.qh"
+#include <server/cl_client.qh>
+#include <server/cl_player.qh>
+#include <server/cl_impulse.qh>
+#include <server/cheats.qh>
+#include <server/g_damage.qh>
+#include <server/round_handler.qh>
+#include <server/scores.qh>
+#include <server/scores_rules.qh>
+
+#include <server/bot/bot.qh>
+#include <server/bot/navigation.qh>
+#include <server/bot/waypoints.qh>
+
+#include <server/bot/havocbot/havocbot.qh>
+#include <server/bot/havocbot/roles.qh>
+
+#include <server/command/vote.qh>
+#include <server/command/common.qh>
+
+#include <server/weapons/common.qh>
+#include <server/weapons/tracing.qh>
+#include <server/weapons/throwing.qh>
+#include <server/weapons/weaponsystem.qh>
 
 #include <common/deathtypes/all.qh>
 #include <common/notifications/all.qh>

diff --git a/qcsrc/server/scores.qh b/qcsrc/server/scores.qh
index 497e5a6aee7f129e1d44a146e576d81ffb870776..b547730efef6035e008386d4fd38d199d55d3fdd 100644 (file)
--- a/qcsrc/server/scores.qh
+++ b/qcsrc/server/scores.qh
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../common/constants.qh"
+#include <common/constants.qh>
 
 entity scores_initialized; // non-world when scores labels/rules have been set
 .float scores[MAX_SCORE];