From 2c344fc12723adf9a1eab4249b77bd459ca357ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Borz=C3=AC?= Date: Sun, 27 Oct 2024 05:06:14 +0100 Subject: [PATCH] refactor(src/server/game/*): remove unused imports (big part 2) (#20311) --- src/server/game/DungeonFinding/LFGMgr.cpp | 1 - src/server/game/DungeonFinding/LFGQueue.cpp | 1 - src/server/game/Entities/Object/Position.h | 1 - src/server/game/Globals/ObjectMgr.cpp | 2 ++ src/server/game/Groups/Group.cpp | 4 ---- src/server/game/Guilds/Guild.h | 2 -- src/server/game/Handlers/ItemHandler.cpp | 1 - src/server/game/Handlers/MiscHandler.cpp | 1 - src/server/game/Loot/LootItemStorage.h | 2 -- src/server/game/Loot/LootMgr.cpp | 1 + src/server/game/Loot/LootMgr.h | 1 - src/server/game/Mails/Mail.h | 1 - src/server/game/Misc/AsyncAuctionListing.h | 2 -- src/server/game/Misc/GameGraveyard.h | 1 - src/server/game/OutdoorPvP/OutdoorPvP.h | 1 - src/server/game/OutdoorPvP/OutdoorPvPMgr.h | 1 - src/server/game/Petitions/PetitionMgr.h | 1 - src/server/scripts/Commands/cs_reload.cpp | 1 + 18 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 9136d3b1a..672bf265f 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -30,7 +30,6 @@ #include "LFGGroupData.h" #include "LFGPlayerData.h" #include "LFGQueue.h" -#include "LFGScripts.h" #include "Language.h" #include "ObjectMgr.h" #include "Opcodes.h" diff --git a/src/server/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp index e662419ac..4c0b82898 100644 --- a/src/server/game/DungeonFinding/LFGQueue.cpp +++ b/src/server/game/DungeonFinding/LFGQueue.cpp @@ -23,7 +23,6 @@ #include "InstanceScript.h" #include "LFGMgr.h" #include "Log.h" -#include "ObjectDefines.h" #include "ObjectMgr.h" #include "Player.h" #include "World.h" diff --git a/src/server/game/Entities/Object/Position.h b/src/server/game/Entities/Object/Position.h index 69ff77a3a..d44da6547 100644 --- a/src/server/game/Entities/Object/Position.h +++ b/src/server/game/Entities/Object/Position.h @@ -20,7 +20,6 @@ #include "Common.h" #include "G3D/Vector3.h" -#include class ByteBuffer; diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 6799ce780..a92668803 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -54,6 +54,8 @@ #include #include +#include "ItemEnchantmentMgr.h" + ScriptMapMap sSpellScripts; ScriptMapMap sEventScripts; ScriptMapMap sWaypointScripts; diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 3ecdf17c6..2b294cd68 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -29,15 +29,11 @@ #include "MapMgr.h" #include "ObjectMgr.h" #include "Opcodes.h" -#include "Pet.h" #include "Player.h" #include "ScriptMgr.h" #include "SharedDefines.h" -#include "SocialMgr.h" -#include "SpellAuras.h" #include "UpdateFieldFlags.h" #include "Util.h" -#include "Vehicle.h" #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index 3ed7e10cc..7e4ce174b 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -22,11 +22,9 @@ #include "ObjectMgr.h" #include "Optional.h" #include "Player.h" -#include "World.h" #include "WorldPacket.h" #include #include -#include class Item; diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index 3873b82a3..610ef3da2 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -25,7 +25,6 @@ #include "ScriptMgr.h" #include "SpellInfo.h" #include "SpellMgr.h" -#include "UpdateData.h" #include "WorldPacket.h" #include "WorldSession.h" #include diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 1f54dfdf3..e95d8a026 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -45,7 +45,6 @@ #include "ScriptMgr.h" #include "SocialMgr.h" #include "Spell.h" -#include "UpdateData.h" #include "Vehicle.h" #include "WhoListCacheMgr.h" #include "World.h" diff --git a/src/server/game/Loot/LootItemStorage.h b/src/server/game/Loot/LootItemStorage.h index 8aa49f996..c1b277142 100644 --- a/src/server/game/Loot/LootItemStorage.h +++ b/src/server/game/Loot/LootItemStorage.h @@ -18,11 +18,9 @@ #ifndef ACORE_LOOTITEMSTORAGE_H #define ACORE_LOOTITEMSTORAGE_H -#include "Common.h" #include "Item.h" #include "LootMgr.h" #include -#include struct StoredLootItem { diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp index d32cb0a92..e4215ff1d 100644 --- a/src/server/game/Loot/LootMgr.cpp +++ b/src/server/game/Loot/LootMgr.cpp @@ -19,6 +19,7 @@ #include "Containers.h" #include "DisableMgr.h" #include "Group.h" +#include "ItemEnchantmentMgr.h" #include "Log.h" #include "ObjectMgr.h" #include "Player.h" diff --git a/src/server/game/Loot/LootMgr.h b/src/server/game/Loot/LootMgr.h index ee785e256..0ba375960 100644 --- a/src/server/game/Loot/LootMgr.h +++ b/src/server/game/Loot/LootMgr.h @@ -20,7 +20,6 @@ #include "ByteBuffer.h" #include "ConditionMgr.h" -#include "ItemEnchantmentMgr.h" #include "ObjectGuid.h" #include "RefMgr.h" #include "SharedDefines.h" diff --git a/src/server/game/Mails/Mail.h b/src/server/game/Mails/Mail.h index 957f8374e..17c078e25 100644 --- a/src/server/game/Mails/Mail.h +++ b/src/server/game/Mails/Mail.h @@ -22,7 +22,6 @@ #include "DatabaseEnvFwd.h" #include "ObjectGuid.h" #include -#include struct AuctionEntry; struct CalendarEvent; diff --git a/src/server/game/Misc/AsyncAuctionListing.h b/src/server/game/Misc/AsyncAuctionListing.h index 110651030..0426b0691 100644 --- a/src/server/game/Misc/AsyncAuctionListing.h +++ b/src/server/game/Misc/AsyncAuctionListing.h @@ -20,8 +20,6 @@ #include "AuctionHouseMgr.h" -#include - class AuctionListOwnerItemsDelayEvent : public BasicEvent { public: diff --git a/src/server/game/Misc/GameGraveyard.h b/src/server/game/Misc/GameGraveyard.h index 35092818b..c3f0a3a39 100644 --- a/src/server/game/Misc/GameGraveyard.h +++ b/src/server/game/Misc/GameGraveyard.h @@ -18,7 +18,6 @@ #ifndef _GAMEGRAVEYARD_H_ #define _GAMEGRAVEYARD_H_ -#include "Common.h" #include "Player.h" #include "SharedDefines.h" #include diff --git a/src/server/game/OutdoorPvP/OutdoorPvP.h b/src/server/game/OutdoorPvP/OutdoorPvP.h index 247ed0834..1d4c8c9e7 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvP.h +++ b/src/server/game/OutdoorPvP/OutdoorPvP.h @@ -19,7 +19,6 @@ #define OUTDOOR_PVP_H_ #include "SharedDefines.h" -#include "Util.h" #include "ZoneScript.h" #include diff --git a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h index 8bc52b1d6..8737c0b5c 100644 --- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h +++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h @@ -21,7 +21,6 @@ #define OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL 1000 #include "OutdoorPvP.h" -#include class Player; class GameObject; diff --git a/src/server/game/Petitions/PetitionMgr.h b/src/server/game/Petitions/PetitionMgr.h index 7dacacb21..97491fb3a 100644 --- a/src/server/game/Petitions/PetitionMgr.h +++ b/src/server/game/Petitions/PetitionMgr.h @@ -18,7 +18,6 @@ #ifndef _PETITIONMGR_H #define _PETITIONMGR_H -#include "Common.h" #include "ObjectGuid.h" #include diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index 87737ac4e..575e30ac8 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -31,6 +31,7 @@ EndScriptData */ #include "CreatureTextMgr.h" #include "DisableMgr.h" #include "GameGraveyard.h" +#include "ItemEnchantmentMgr.h" #include "LFGMgr.h" #include "Language.h" #include "MapMgr.h"