chore(Cleanup): cleanup with WarheadCleanup. Sort includes

-- Warhead cleanup stats: 1. File: ScriptObject.h. Lines: 1 2. File: ScriptMgr.h. Lines: 1 3. File: LootMgr.cpp. Lines: 1 4. File: World.cpp. Lines: 1 5. File: PacketUtilities.h. Lines: 1 6. File: SpellAuraEffects.cpp. Lines: 1 7. File: SpellInfo.cpp. Lines: 1 8. File: ObjectMgr.cpp. Lines: 1 9. File: MiscHandler.cpp. Lines: 1 10. File: CharacterHandler.cpp. Lines: 1 11. File: WardenPayloadMgr.cpp. Lines: 1 12. File: MotdMgr.cpp. Lines: 1 13. File: Map.cpp. Lines: 1 14. File: GameObject.h. Lines: 1 15. File: enuminfo_Unit.cpp. Lines: 1 16. File: Unit.cpp. Lines: 1 17. File: enuminfo_ItemTemplate.cpp. Lines: 1 18. File: Transport.cpp. Lines: 1 19. File: Pet.cpp. Lines: 1 20. File: AuctionHouseBotBuyer.cpp. Lines: 1 21. File: AuctionHouseBot.cpp. Lines: 1 22. File: AuctionHouseBotBuyer.h. Lines: 1 23. File: AuctionHouseBotSeller.cpp. Lines: 1 24. File: AuctionHouseBotSeller.h. Lines: 1 25. File: AuctionHouseMgr.h. Lines: 1 26. File: AsyncAuctionMgr.h. Lines: 1 27. File: AsyncAuctionMgr.cpp. Lines: 1 28. File: Battleground.cpp. Lines: 1 29. File: BattlegroundWS.cpp. Lines: 1 30. File: ObjectGridLoader.cpp. Lines: 1 31. File: boss_magtheridon.cpp. Lines: 1 32. File: boss_talon_king_ikiss.cpp. Lines: 1 33. File: boss_gruul.cpp. Lines: 1 34. File: boss_high_king_maulgar.cpp. Lines: 1 35. File: boss_warlord_kalithresh.cpp. Lines: 1 36. File: the_slave_pens.cpp. Lines: 1 37. File: boss_netherspite.cpp. Lines: 1 38. File: bosses_opera.cpp. Lines: 1 39. File: boss_chess_event.cpp. Lines: 1 40. File: boss_shade_of_aran.cpp. Lines: 1 41. File: spell_item.cpp. Lines: 1 42. File: spell_generic.cpp. Lines: 1 43. File: cs_server.cpp. Lines: 1 44. File: the_black_morass.cpp. Lines: 1 45. File: zone_dalaran.cpp. Lines: 1 46. File: ulduar.cpp. Lines: 1 47. File: zone_dragonblight.cpp. Lines: 1 48. File: boss_malygos.cpp. Lines: 1 49. File: pet_hunter.cpp. Lines: 1 50. File: DatabaseWorkerPool.cpp. Lines: 1 51. File: RASession.cpp. Lines: 1 52. File: Log.cpp. Lines: 1 53. File: QuestBuff.cpp. Lines: 1
WarheadCore · Sep 9, 2023 · 2c3dbe3 · 2c3dbe3
1 parent 87eb033
commit 2c3dbe3
Show file tree

Hide file tree

Showing 53 changed files with 71 additions and 71 deletions.
diff --git a/modules/mod-quest-buff/src/QuestBuff.cpp b/modules/mod-quest-buff/src/QuestBuff.cpp
@@ -16,13 +16,13 @@
  */
 
 #include "QuestBuff.h"
+#include "DBCStores.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "ModulesConfig.h"
-#include "DatabaseEnv.h"
-#include "StopWatch.h"
 #include "ObjectMgr.h"
-#include "DBCStores.h"
 #include "Player.h"
+#include "StopWatch.h"
 
 QuestBuffMgr* QuestBuffMgr::instance()
 {

diff --git a/src/common/Logging/Log.cpp b/src/common/Logging/Log.cpp
@@ -20,15 +20,15 @@
 #include "Errors.h"
 #include "FileUtil.h"
 #include "StringConvert.h"
-#include "Tokenize.h"
 #include "Timer.h"
+#include "Tokenize.h"
 #include <filesystem>
-#include <utility>
 #include <fmt/std.h>
-#include <spdlog/spdlog.h>
+#include <spdlog/sinks/basic_file_sink.h>
 #include <spdlog/sinks/sink.h>
 #include <spdlog/sinks/stdout_color_sinks.h>
-#include <spdlog/sinks/basic_file_sink.h>
+#include <spdlog/spdlog.h>
+#include <utility>
 
 #if WARHEAD_PLATFORM == WARHEAD_PLATFORM_WINDOWS
 #include <spdlog/details/windows_include.h>

diff --git a/src/server/apps/worldserver/RemoteAccess/RASession.cpp b/src/server/apps/worldserver/RemoteAccess/RASession.cpp
@@ -24,8 +24,8 @@
 #include "DatabaseEnv.h"
 #include "Duration.h"
 #include "Log.h"
-#include "SRP6.h"
 #include "MotdMgr.h"
+#include "SRP6.h"
 #include "Util.h"
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/read_until.hpp>

diff --git a/src/server/database/Database/DatabaseWorkerPool.cpp b/src/server/database/Database/DatabaseWorkerPool.cpp
@@ -16,9 +16,9 @@
  */
 
 #include "DatabaseWorkerPool.h"
+#include "Config.h"
 #include "DatabaseAsyncOperation.h"
 #include "DatabaseAsyncQueueWorker.h"
-#include "Config.h"
 #include "Errors.h"
 #include "FileUtil.h"
 #include "Log.h"

diff --git a/src/server/game/Auction/AsyncAuctionMgr.cpp b/src/server/game/Auction/AsyncAuctionMgr.cpp
@@ -16,8 +16,8 @@
  */
 
 #include "AsyncAuctionMgr.h"
-#include "AuctionHouseBot.h"
 #include "AsyncAuctionOperation.h"
+#include "AuctionHouseBot.h"
 #include "GameTime.h"
 #include "Log.h"
 #include "PCQueue.h"

diff --git a/src/server/game/Auction/AsyncAuctionMgr.h b/src/server/game/Auction/AsyncAuctionMgr.h
@@ -20,8 +20,8 @@
 
 #include "AuctionFwd.h"
 #include <memory>
-#include <vector>
 #include <thread>
+#include <vector>
 
 template <typename T>
 class ProducerConsumerQueue;

diff --git a/src/server/game/Auction/AuctionHouseBot/AuctionHouseBot.cpp b/src/server/game/Auction/AuctionHouseBot/AuctionHouseBot.cpp
@@ -16,21 +16,21 @@
  */
 
 #include "AuctionHouseBot.h"
-#include "AsyncAuctionMgr.h"
 #include "AccountMgr.h"
+#include "AsyncAuctionMgr.h"
 #include "AuctionHouseBotBuyer.h"
 #include "AuctionHouseBotSeller.h"
 #include "AuctionHouseMgr.h"
 #include "Config.h"
 #include "Containers.h"
 #include "DatabaseEnv.h"
-#include "SmartEnum.h"
 #include "GameConfig.h"
 #include "GameTime.h"
 #include "Item.h"
 #include "Log.h"
-#include "TaskScheduler.h"
+#include "SmartEnum.h"
 #include "StopWatch.h"
+#include "TaskScheduler.h"
 
 AuctionBotConfig* AuctionBotConfig::instance()
 {

diff --git a/src/server/game/Auction/AuctionHouseBot/AuctionHouseBotBuyer.cpp b/src/server/game/Auction/AuctionHouseBot/AuctionHouseBotBuyer.cpp
@@ -16,9 +16,9 @@
  */
 
 #include "AuctionHouseBotBuyer.h"
+#include "DatabaseEnv.h"
 #include "GameConfig.h"
 #include "GameTime.h"
-#include "DatabaseEnv.h"
 #include "Item.h"
 #include "ItemTemplate.h"
 #include "Log.h"

diff --git a/src/server/game/Auction/AuctionHouseBot/AuctionHouseBotBuyer.h b/src/server/game/Auction/AuctionHouseBot/AuctionHouseBotBuyer.h
@@ -18,9 +18,9 @@
 #ifndef AUCTION_HOUSE_BOT_BUYER_H
 #define AUCTION_HOUSE_BOT_BUYER_H
 
-#include "Define.h"
-#include "AuctionHouseMgr.h"
 #include "AuctionHouseBot.h"
+#include "AuctionHouseMgr.h"
+#include "Define.h"
 
 struct BuyerAuctionEval
 {

diff --git a/src/server/game/Auction/AuctionHouseBot/AuctionHouseBotSeller.cpp b/src/server/game/Auction/AuctionHouseBot/AuctionHouseBotSeller.cpp
@@ -18,18 +18,18 @@
 #include "AuctionHouseBotSeller.h"
 #include "AuctionHouseMgr.h"
 #include "Containers.h"
-#include "DatabaseEnv.h"
 #include "DBCStores.h"
-#include "SmartEnum.h"
+#include "DatabaseEnv.h"
 #include "GameConfig.h"
 #include "GameTime.h"
 #include "Item.h"
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "Random.h"
-#include "Tokenize.h"
-#include "StringConvert.h"
+#include "SmartEnum.h"
 #include "StopWatch.h"
+#include "StringConvert.h"
+#include "Tokenize.h"
 
 AuctionBotSeller::AuctionBotSeller()
 {

diff --git a/src/server/game/Auction/AuctionHouseBot/AuctionHouseBotSeller.h b/src/server/game/Auction/AuctionHouseBot/AuctionHouseBotSeller.h
@@ -18,9 +18,9 @@
 #ifndef AUCTION_HOUSE_BOT_SELLER_H
 #define AUCTION_HOUSE_BOT_SELLER_H
 
+#include "AuctionHouseBot.h"
 #include "Define.h"
 #include "ItemTemplate.h"
-#include "AuctionHouseBot.h"
 
 struct ItemToSell
 {

diff --git a/src/server/game/Auction/AuctionHouseMgr.h b/src/server/game/Auction/AuctionHouseMgr.h
@@ -24,8 +24,8 @@
 #include "EventProcessor.h"
 #include "ObjectGuid.h"
 #include <functional>
-#include <unordered_map>
 #include <shared_mutex>
+#include <unordered_map>
 
 class Item;
 class Player;

diff --git a/src/server/game/Battlegrounds/Battleground.cpp b/src/server/game/Battlegrounds/Battleground.cpp
@@ -31,6 +31,7 @@
 #include "DatabaseEnv.h"
 #include "Formulas.h"
 #include "GameConfig.h"
+#include "GameEventMgr.h"
 #include "GameGraveyard.h"
 #include "GameLocale.h"
 #include "GridNotifiersImpl.h"
@@ -49,7 +50,6 @@
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldStatePackets.h"
-#include "GameEventMgr.h"
 
 Battleground::Battleground()
 {

diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
@@ -23,8 +23,8 @@
 #include "GameConfig.h"
 #include "GameGraveyard.h"
 #include "GameObject.h"
-#include "ObjectAccessor.h"
 #include "Object.h"
+#include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "World.h"

diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h
@@ -21,10 +21,10 @@
 #include "Common.h"
 #include "DatabaseEnvFwd.h"
 #include "G3D/Quat.h"
+#include "GameObjectData.h"
 #include "LootMgr.h"
 #include "Object.h"
 #include "SharedDefines.h"
-#include "GameObjectData.h"
 #include "Unit.h"
 #include <array>
 

diff --git a/src/server/game/Entities/Item/enuminfo_ItemTemplate.cpp b/src/server/game/Entities/Item/enuminfo_ItemTemplate.cpp
@@ -15,8 +15,8 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ItemTemplate.h"
 #include "Define.h"
+#include "ItemTemplate.h"
 #include "SmartEnum.h"
 #include <stdexcept>
 

diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
@@ -23,7 +23,9 @@
 #include "GameLocale.h"
 #include "GameTime.h"
 #include "Group.h"
+#include "InstanceScript.h"
 #include "Log.h"
+#include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "PetLoadQueryHolder.h"
 #include "PetPackets.h"
@@ -37,8 +39,6 @@
 #include "Util.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "ObjectAccessor.h"
-#include "InstanceScript.h"
 #include <sstream>
 
 Pet::Pet(Player* owner, PetType type) : Guardian(nullptr, owner ? owner->GetGUID() : ObjectGuid::Empty, true),

diff --git a/src/server/game/Entities/Transport/Transport.cpp b/src/server/game/Entities/Transport/Transport.cpp
@@ -24,13 +24,13 @@
 #include "GameTime.h"
 #include "MapMgr.h"
 #include "MapReference.h"
+#include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "ScriptMgr.h"
 #include "Spell.h"
 #include "Vehicle.h"
 #include "WorldModel.h"
-#include "ObjectAccessor.h"
 #include <sstream>
 
 MotionTransport::MotionTransport() : Transport(), _transportInfo(nullptr), _isMoving(true), _pendingStop(false), _triggeredArrivalEvent(false), _triggeredDepartureEvent(false), _passengersLoaded(false), _delayedTeleport(false)

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
@@ -37,9 +37,9 @@
 #include "DisableMgr.h"
 #include "DynamicVisibility.h"
 #include "Formulas.h"
-#include "GameObjectAI.h"
 #include "GameConfig.h"
 #include "GameLocale.h"
+#include "GameObjectAI.h"
 #include "GameTime.h"
 #include "GridNotifiersImpl.h"
 #include "Group.h"

diff --git a/src/server/game/Entities/Unit/enuminfo_Unit.cpp b/src/server/game/Entities/Unit/enuminfo_Unit.cpp
@@ -15,9 +15,9 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "Unit.h"
 #include "Define.h"
 #include "SmartEnum.h"
+#include "Unit.h"
 #include <stdexcept>
 
 namespace Warhead::Impl::EnumUtilsImpl

diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
@@ -27,9 +27,9 @@
 #include "Config.h"
 #include "Containers.h"
 #include "CreatureAIFactory.h"
+#include "DBCStructure.h"
 #include "DBCacheMgr.h"
 #include "DatabaseEnv.h"
-#include "DBCStructure.h"
 #include "DisableMgr.h"
 #include "GameConfig.h"
 #include "GameEventMgr.h"

diff --git a/src/server/game/Grids/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp
@@ -21,10 +21,10 @@
 #include "ObjectGridLoader.h"
 #include "CellImpl.h"
 #include "Corpse.h"
-#include "GridNotifiers.h"
 #include "Creature.h"
 #include "DynamicObject.h"
 #include "GameObject.h"
+#include "GridNotifiers.h"
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "Transport.h"

diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
@@ -41,6 +41,7 @@
 #include "LoginQueryHolder.h"
 #include "MapMgr.h"
 #include "Metric.h"
+#include "MotdMgr.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "Opcodes.h"
@@ -51,7 +52,6 @@
 #include "Realm.h"
 #include "ReputationMgr.h"
 #include "ScriptMgr.h"
-#include "MotdMgr.h"
 #include "SharedDefines.h"
 #include "SocialMgr.h"
 #include "SpellAuraEffects.h"

diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
@@ -34,6 +34,7 @@
 #include "GossipDef.h"
 #include "Group.h"
 #include "GuildMgr.h"
+#include "InstanceScript.h"
 #include "Language.h"
 #include "Log.h"
 #include "LootMgr.h"
@@ -55,7 +56,6 @@
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "InstanceScript.h"
 #include <zlib.h>
 
 void WorldSession::HandleRepopRequestOpcode(WorldPacket& recv_data)

diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp
@@ -21,8 +21,8 @@
 #include "LootMgr.h"
 #include "Containers.h"
 #include "DatabaseEnv.h"
-#include "GameConfig.h"
 #include "DisableMgr.h"
+#include "GameConfig.h"
 #include "Group.h"
 #include "Log.h"
 #include "ObjectAccessor.h"

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
@@ -27,6 +27,7 @@
 #include "GameObjectModel.h"
 #include "GameTime.h"
 #include "GridNotifiers.h"
+#include "IVMapMgr.h"
 #include "InstanceScript.h"
 #include "LFGMgr.h"
 #include "MapMgr.h"
@@ -36,10 +37,9 @@
 #include "ScriptMgr.h"
 #include "Transport.h"
 #include "VMapFactory.h"
+#include "VMapMgr2.h"
 #include "Vehicle.h"
 #include "Weather.h"
-#include "IVMapMgr.h"
-#include "VMapMgr2.h"
 #include <utility>
 
 union u_map_magic

diff --git a/src/server/game/Motd/MotdMgr.cpp b/src/server/game/Motd/MotdMgr.cpp
@@ -16,14 +16,14 @@
  */
 
 #include "MotdMgr.h"
-#include "DatabaseEnv.h"
 #include "Config.h"
+#include "DatabaseEnv.h"
+#include "Log.h"
 #include "Opcodes.h"
 #include "ScriptMgr.h"
-#include "WorldPacket.h"
-#include "Tokenize.h"
 #include "StopWatch.h"
-#include "Log.h"
+#include "Tokenize.h"
+#include "WorldPacket.h"
 #include <iterator>
 
 namespace

diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
@@ -19,10 +19,10 @@
 #define SC_SCRIPTMGR_H
 
 #include "Common.h"
-#include "ScriptObjectFwd.h"
 #include "DatabaseEnvFwd.h"
 #include "Duration.h"
 #include "LFG.h"
+#include "ScriptObjectFwd.h"
 #include "SharedDefines.h"
 #include <string_view>