refactor(Core): sort #includes alphabetically (#4579)

2026-01-28 08:06:23 +00:00 · 2021-02-24 22:34:42 +01:00
parent 51342ef9b5
commit dbc0ff6554
839 changed files with 3120 additions and 3157 deletions
--- a/src/server/game/Movement/FollowerReference.cpp
+++ b/src/server/game/Movement/FollowerReference.cpp
@@ -4,9 +4,9 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "Unit.h"
-#include "TargetedMovementGenerator.h"
 #include "FollowerReference.h"
+#include "TargetedMovementGenerator.h"
+#include "Unit.h"

 void FollowerReference::targetObjectBuildLink()
 {
--- a/src/server/game/Movement/MotionMaster.cpp
+++ b/src/server/game/Movement/MotionMaster.cpp
@@ -4,24 +4,22 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "MotionMaster.h"
-#include "CreatureAISelector.h"
-#include "Creature.h"
-
 #include "ConfusedMovementGenerator.h"
+#include "Creature.h"
+#include "CreatureAISelector.h"
+#include "EscortMovementGenerator.h"
 #include "FleeingMovementGenerator.h"
 #include "HomeMovementGenerator.h"
 #include "IdleMovementGenerator.h"
-#include "PointMovementGenerator.h"
-#include "TargetedMovementGenerator.h"
-#include "WaypointMovementGenerator.h"
-#include "RandomMovementGenerator.h"
-#include "EscortMovementGenerator.h"
+#include "MotionMaster.h"
 #include "MoveSpline.h"
 #include "MoveSplineInit.h"
+#include "PointMovementGenerator.h"
+#include "RandomMovementGenerator.h"
+#include "TargetedMovementGenerator.h"
+#include "WaypointMovementGenerator.h"
 #include <cassert>

-
 // ---- ChaseRange ---- //

 ChaseRange::ChaseRange(float range) : MinRange(range > CONTACT_DISTANCE ? 0 : range - CONTACT_DISTANCE), MinTolerance(range), MaxRange(range + CONTACT_DISTANCE), MaxTolerance(range) { }
--- a/src/server/game/Movement/MotionMaster.h
+++ b/src/server/game/Movement/MotionMaster.h
@@ -8,11 +8,11 @@
 #define ACORE_MOTIONMASTER_H

 #include "Common.h"
-#include <vector>
-#include "SharedDefines.h"
 #include "Object.h"
+#include "SharedDefines.h"
 #include "Spline/MoveSpline.h"
 #include <optional>
+#include <vector>

 class MovementGenerator;
 class Unit;
--- a/src/server/game/Movement/MovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerator.h
@@ -7,11 +7,11 @@
 #ifndef ACORE_MOVEMENTGENERATOR_H
 #define ACORE_MOVEMENTGENERATOR_H

-#include "Define.h"
-#include "ObjectRegistry.h"
-#include "FactoryHolder.h"
 #include "Common.h"
+#include "Define.h"
+#include "FactoryHolder.h"
 #include "MotionMaster.h"
+#include "ObjectRegistry.h"

 class Unit;

--- a/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
@@ -4,13 +4,13 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

+#include "ConfusedMovementGenerator.h"
 #include "Creature.h"
 #include "MapManager.h"
-#include "ConfusedMovementGenerator.h"
-#include "VMapFactory.h"
-#include "MoveSplineInit.h"
 #include "MoveSpline.h"
+#include "MoveSplineInit.h"
 #include "Player.h"
+#include "VMapFactory.h"

 #ifdef MAP_BASED_RAND_GEN
 #define rand_norm() unit.rand_norm()
--- a/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/EscortMovementGenerator.cpp
@@ -2,14 +2,14 @@
 Written by Xinef
 */

-#include "EscortMovementGenerator.h"
-#include "Errors.h"
 #include "Creature.h"
 #include "CreatureAI.h"
-#include "World.h"
-#include "MoveSplineInit.h"
+#include "Errors.h"
+#include "EscortMovementGenerator.h"
 #include "MoveSpline.h"
+#include "MoveSplineInit.h"
 #include "Player.h"
+#include "World.h"

 template<class T>
 void EscortMovementGenerator<T>::DoInitialize(T* unit)
--- a/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
@@ -6,11 +6,11 @@

 #include "Creature.h"
 #include "CreatureAI.h"
-#include "MapManager.h"
 #include "FleeingMovementGenerator.h"
-#include "ObjectAccessor.h"
-#include "MoveSplineInit.h"
+#include "MapManager.h"
 #include "MoveSpline.h"
+#include "MoveSplineInit.h"
+#include "ObjectAccessor.h"
 #include "Player.h"
 #include "VMapFactory.h"

--- a/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
@@ -4,12 +4,12 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "HomeMovementGenerator.h"
 #include "Creature.h"
 #include "CreatureAI.h"
-#include "WorldPacket.h"
-#include "MoveSplineInit.h"
+#include "HomeMovementGenerator.h"
 #include "MoveSpline.h"
+#include "MoveSplineInit.h"
+#include "WorldPacket.h"

 void HomeMovementGenerator<Creature>::DoInitialize(Creature* owner)
 {
--- a/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
@@ -4,9 +4,9 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "IdleMovementGenerator.h"
-#include "CreatureAI.h"
 #include "Creature.h"
+#include "CreatureAI.h"
+#include "IdleMovementGenerator.h"

 IdleMovementGenerator si_idleMovement;

--- a/src/server/game/Movement/MovementGenerators/PathGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/PathGenerator.cpp
@@ -4,15 +4,15 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "PathGenerator.h"
-#include "Map.h"
 #include "Creature.h"
+#include "DetourCommon.h"
+#include "DisableMgr.h"
+#include "Geometry.h"
+#include "Log.h"
+#include "Map.h"
 #include "MMapFactory.h"
 #include "MMapManager.h"
-#include "Log.h"
-#include "DisableMgr.h"
-#include "DetourCommon.h"
-#include "Geometry.h"
+#include "PathGenerator.h"

 ////////////////// PathGenerator //////////////////
 PathGenerator::PathGenerator(WorldObject const* owner) :
--- a/src/server/game/Movement/MovementGenerators/PathGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/PathGenerator.h
@@ -7,13 +7,13 @@
 #ifndef _PATH_GENERATOR_H
 #define _PATH_GENERATOR_H

-#include "SharedDefines.h"
 #include "DetourNavMesh.h"
 #include "DetourNavMeshQuery.h"
-#include "MoveSplineInitArgs.h"
-#include <G3D/Vector3.h>
 #include "MMapFactory.h"
 #include "MMapManager.h"
+#include "MoveSplineInitArgs.h"
+#include "SharedDefines.h"
+#include <G3D/Vector3.h>

 class Unit;
 class WorldObject;
--- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
@@ -4,14 +4,14 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "PointMovementGenerator.h"
-#include "Errors.h"
 #include "Creature.h"
 #include "CreatureAI.h"
-#include "World.h"
-#include "MoveSplineInit.h"
+#include "Errors.h"
 #include "MoveSpline.h"
+#include "MoveSplineInit.h"
 #include "Player.h"
+#include "PointMovementGenerator.h"
+#include "World.h"

 //----- Point Movement Generator
 template<class T>
--- a/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
@@ -7,8 +7,8 @@
 #ifndef ACORE_POINTMOVEMENTGENERATOR_H
 #define ACORE_POINTMOVEMENTGENERATOR_H

-#include "MovementGenerator.h"
 #include "FollowerReference.h"
+#include "MovementGenerator.h"

 template<class T>
 class PointMovementGenerator : public MovementGeneratorMedium< T, PointMovementGenerator<T> >
--- a/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
@@ -3,15 +3,15 @@
 */

 #include "Creature.h"
-#include "MapManager.h"
-#include "RandomMovementGenerator.h"
-#include "ObjectAccessor.h"
-#include "Map.h"
-#include "Util.h"
 #include "CreatureGroups.h"
-#include "MoveSplineInit.h"
+#include "Map.h"
+#include "MapManager.h"
 #include "MoveSpline.h"
+#include "MoveSplineInit.h"
+#include "ObjectAccessor.h"
+#include "RandomMovementGenerator.h"
 #include "Spell.h"
+#include "Util.h"

 template<>
 void RandomMovementGenerator<Creature>::_setRandomLocation(Creature* creature)
--- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
@@ -4,14 +4,14 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "TargetedMovementGenerator.h"
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "MoveSplineInit.h"
+#include "Pet.h"
 #include "Player.h"
 #include "Spell.h"
+#include "TargetedMovementGenerator.h"
 #include "Transport.h"
-#include "Pet.h"

 static bool IsMutualChase(Unit* owner, Unit* target)
 {
--- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
@@ -7,11 +7,11 @@
 #ifndef ACORE_TARGETEDMOVEMENTGENERATOR_H
 #define ACORE_TARGETEDMOVEMENTGENERATOR_H

-#include "MovementGenerator.h"
 #include "FollowerReference.h"
+#include "MovementGenerator.h"
+#include "PathGenerator.h"
 #include "Timer.h"
 #include "Unit.h"
-#include "PathGenerator.h"
 #include <optional>

 class TargetedMovementGeneratorBase
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
@@ -3,23 +3,19 @@
 * Copyright (C) 2008-2016 TrinityCore <http://www.trinitycore.org/>
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */
-//Basic headers
-#include "WaypointMovementGenerator.h"
-//Extended headers
-#include "ObjectMgr.h"
-#include "World.h"
-#include "Transport.h"
-//Flightmaster grid preloading
-#include "MapManager.h"
-//Creature-specific headers
+
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "CreatureGroups.h"
-//Player-specific
-#include "Player.h"
-#include "MoveSplineInit.h"
+#include "MapManager.h"
 #include "MoveSpline.h"
+#include "MoveSplineInit.h"
+#include "ObjectMgr.h"
+#include "Player.h"
 #include "Spell.h"
+#include "Transport.h"
+#include "WaypointMovementGenerator.h"
+#include "World.h"

 void WaypointMovementGenerator<Creature>::LoadPath(Creature* creature)
 {
--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
@@ -14,9 +14,8 @@
 */

 #include "MovementGenerator.h"
-#include "WaypointManager.h"
-
 #include "Player.h"
+#include "WaypointManager.h"

 #define FLIGHT_TRAVEL_UPDATE  100
 #define TIMEDIFF_NEXT_WP      250
--- a/src/server/game/Movement/Spline/MoveSpline.cpp
+++ b/src/server/game/Movement/Spline/MoveSpline.cpp
@@ -4,10 +4,10 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

+#include "Creature.h"
+#include "Log.h"
 #include "MoveSpline.h"
 #include <sstream>
-#include "Log.h"
-#include "Creature.h"

 namespace Movement
 {
--- a/src/server/game/Movement/Spline/MoveSpline.h
+++ b/src/server/game/Movement/Spline/MoveSpline.h
@@ -7,8 +7,8 @@
 #ifndef TRINITYSERVER_MOVEPLINE_H
 #define TRINITYSERVER_MOVEPLINE_H

-#include "Spline.h"
 #include "MoveSplineInitArgs.h"
+#include "Spline.h"

 namespace Movement
 {
--- a/src/server/game/Movement/Spline/MoveSplineFlag.h
+++ b/src/server/game/Movement/Spline/MoveSplineFlag.h
@@ -6,8 +6,8 @@

 #ifndef TRINITYSERVER_MOVESPLINEFLAG_H
 #define TRINITYSERVER_MOVESPLINEFLAG_H
-#include "MovementTypedefs.h"

+#include "MovementTypedefs.h"
 #include <string>

 namespace Movement
--- a/src/server/game/Movement/Spline/MoveSplineInit.cpp
+++ b/src/server/game/Movement/Spline/MoveSplineInit.cpp
@@ -4,14 +4,14 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

-#include "MoveSplineInit.h"
-#include "MoveSpline.h"
 #include "MovementPacketBuilder.h"
-#include "Unit.h"
+#include "MoveSpline.h"
+#include "MoveSplineInit.h"
+#include "Opcodes.h"
 #include "Transport.h"
+#include "Unit.h"
 #include "Vehicle.h"
 #include "WorldPacket.h"
-#include "Opcodes.h"

 namespace Movement
 {
--- a/src/server/game/Movement/Spline/MovementPacketBuilder.cpp
+++ b/src/server/game/Movement/Spline/MovementPacketBuilder.cpp
@@ -4,9 +4,9 @@
 * Copyright (C) 2005-2009 MaNGOS <http://getmangos.com/>
 */

+#include "ByteBuffer.h"
 #include "MovementPacketBuilder.h"
 #include "MoveSpline.h"
-#include "ByteBuffer.h"

 namespace Movement
 {
--- a/src/server/game/Movement/Spline/Spline.cpp
+++ b/src/server/game/Movement/Spline/Spline.cpp
@@ -5,8 +5,8 @@
 */

 #include "Spline.h"
-#include <sstream>
 #include <G3D/Matrix4.h>
+#include <sstream>

 namespace Movement
 {
--- a/src/server/game/Movement/Waypoints/WaypointManager.cpp
+++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp
@@ -6,9 +6,9 @@

 #include "DatabaseEnv.h"
 #include "GridDefines.h"
-#include "WaypointManager.h"
-#include "MapManager.h"
 #include "Log.h"
+#include "MapManager.h"
+#include "WaypointManager.h"

 WaypointMgr::WaypointMgr()
 {
--- a/src/server/game/Movement/Waypoints/WaypointManager.h
+++ b/src/server/game/Movement/Waypoints/WaypointManager.h
@@ -8,8 +8,8 @@
 #define ACORE_WAYPOINTMANAGER_H

 #include "Common.h"
-#include <vector>
 #include <unordered_map>
+#include <vector>

 enum WaypointMoveType
 {