* Remove the last of the realative paths from #include statements

--HG-- branch : trunk
2026-01-16 07:30:42 +01:00 · 2010-06-08 17:01:03 -06:00
parent dee7fd1382
commit bc04d7ce25
44 changed files with 67 additions and 67 deletions
--- a/src/server/game/Movement/DestinationHolder.h
+++ b/src/server/game/Movement/DestinationHolder.h
@@ -22,7 +22,7 @@
 #define TRINITY_DESTINATION_HOLDER_H

 #include "Define.h"
-#include "Utilities/Timer.h"
+#include "Timer.h"

 class WorldObject;
 class Map;
--- a/src/server/game/Movement/FollowerRefManager.h
+++ b/src/server/game/Movement/FollowerRefManager.h
@@ -21,7 +21,7 @@
 #ifndef _FOLLOWERREFMANAGER
 #define _FOLLOWERREFMANAGER

-#include "Dynamic/LinkedReference/RefManager.h"
+#include "RefManager.h"

 class Unit;
 class TargetedMovementGeneratorBase;
--- a/src/server/game/Movement/FollowerReference.h
+++ b/src/server/game/Movement/FollowerReference.h
@@ -21,7 +21,7 @@
 #ifndef _FOLLOWERREFERENCE_H
 #define _FOLLOWERREFERENCE_H

-#include "Dynamic/LinkedReference/Reference.h"
+#include "Reference.h"

 class TargetedMovementGeneratorBase;
 class Unit;
--- a/src/server/game/Movement/MovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerator.h
@@ -22,9 +22,9 @@
 #define TRINITY_MOVEMENTGENERATOR_H

 #include "Define.h"
-#include "Policies/Singleton.h"
-#include "Dynamic/ObjectRegistry.h"
-#include "Dynamic/FactoryHolder.h"
+#include "Singleton.h"
+#include "ObjectRegistry.h"
+#include "FactoryHolder.h"
 #include "Common.h"
 #include "MotionMaster.h"

--- a/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
+++ b/src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
@@ -29,8 +29,8 @@

 #include "MovementGenerator.h"
 #include "DestinationHolder.h"
-#include "Movement/Waypoints/WaypointManager.h"
-#include "Movement/Waypoints/Path.h"
+#include "WaypointManager.h"
+#include "Path.h"
 #include "Traveller.h"

 #include "Player.h"
--- a/src/server/game/Movement/Waypoints/WaypointManager.cpp
+++ b/src/server/game/Movement/Waypoints/WaypointManager.cpp
@@ -18,7 +18,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */

-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "GridDefines.h"
 #include "WaypointManager.h"
 #include "ProgressBar.h"
--- a/src/server/game/OutdoorPvP/OutdoorPvP.h
+++ b/src/server/game/OutdoorPvP/OutdoorPvP.h
@@ -20,7 +20,7 @@
 #define OUTDOOR_PVP_H_

 #include "Utilities/Util.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "SharedDefines.h"
 #include "ZoneScript.h"

 class GameObject;
--- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
@@ -25,7 +25,7 @@
 #include "OutdoorPvPEP.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"

 INSTANTIATE_SINGLETON_1(OutdoorPvPMgr);

--- a/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
+++ b/src/server/game/OutdoorPvP/OutdoorPvPMgr.h
@@ -22,7 +22,7 @@
 #define OUTDOORPVP_OBJECTIVE_UPDATE_INTERVAL 1000

 #include "OutdoorPvP.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"

 class Player;
 class GameObject;
--- a/src/server/game/Pools/PoolHandler.cpp
+++ b/src/server/game/Pools/PoolHandler.cpp
@@ -21,7 +21,7 @@
 #include "ProgressBar.h"
 #include "Log.h"
 #include "MapManager.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"

 INSTANTIATE_SINGLETON_1(PoolHandler);

@@ -750,4 +750,4 @@ void PoolHandler::UpdatePool(uint16 pool_id, uint32 db_guid_or_pool_id)

 template void PoolHandler::UpdatePool<Pool>(uint16 pool_id, uint32 db_guid_or_pool_id);
 template void PoolHandler::UpdatePool<GameObject>(uint16 pool_id, uint32 db_guid_or_pool_id);
-template void PoolHandler::UpdatePool<Creature>(uint16 pool_id, uint32 db_guid_or_pool_id);
+template void PoolHandler::UpdatePool<Creature>(uint16 pool_id, uint32 db_guid_or_pool_id);
--- a/src/server/game/Pools/PoolHandler.h
+++ b/src/server/game/Pools/PoolHandler.h
@@ -20,7 +20,7 @@
 #define TRINITY_POOLHANDLER_H

 #include "Define.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 #include "Creature.h"
 #include "GameObject.h"

--- a/src/server/game/PrecompiledHeaders/NixCorePCH.h
+++ b/src/server/game/PrecompiledHeaders/NixCorePCH.h
@@ -1,12 +1,12 @@
 //add here most rarely modified headers to speed up debug build compilation
-#include "Server/WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
+#include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
 #include "Common.h"

 #include "MapManager.h"
 #include "Logging/Log.h"
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"
-#include "Database/SQLStorage.h"
-#include "Server/Protocol/Opcodes.h"
-#include "Miscellaneous/SharedDefines.h"
+#include "SQLStorage.h"
+#include "Opcodes.h"
+#include "SharedDefines.h"
 #include "ObjectMgr.h"
--- a/src/server/game/PrecompiledHeaders/WinCorePCH.cpp
+++ b/src/server/game/PrecompiledHeaders/WinCorePCH.cpp
@@ -1 +1 @@
-#include "pchdef.h"
+#include "WinCorePCH.h"
--- a/src/server/game/PrecompiledHeaders/WinCorePCH.h
+++ b/src/server/game/PrecompiledHeaders/WinCorePCH.h
@@ -6,7 +6,7 @@
 #include "Log.h"
 #include "ObjectAccessor.h"
 #include "ObjectDefines.h"
-#include "Database/SQLStorage.h"
+#include "SQLStorage.h"
 #include "Opcodes.h"
 #include "SharedDefines.h"
 #include "ObjectMgr.h"
--- a/src/server/game/Quests/QuestDef.h
+++ b/src/server/game/Quests/QuestDef.h
@@ -22,7 +22,7 @@
 #define TRINITYCORE_QUEST_H

 #include "Define.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"

 #include <string>
 #include <vector>
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -3,14 +3,14 @@
 * Please see the included DOCS/LICENSE.TXT for more information */

 #include "ScriptPCH.h"
-#include "Configuration/Config.h"
-#include "Database/DatabaseEnv.h"
+#include "Config.h"
+#include "DatabaseEnv.h"
 #include "DBCStores.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
 #include "ScriptLoader.h"
 #include "ScriptSystem.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"

 INSTANTIATE_SINGLETON_1(ScriptMgr);

--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -11,7 +11,7 @@
 #include "Common.h"
 #include "CompilerDefs.h"
 #include "DBCStructure.h"
-#include "Configuration/ConfigEnv.h"
+#include "ConfigEnv.h"

 class Player;
 class Creature;
--- a/src/server/game/Scripting/ScriptSystem.cpp
+++ b/src/server/game/Scripting/ScriptSystem.cpp
@@ -22,7 +22,7 @@
 #include "ScriptSystem.h"
 #include "ProgressBar.h"
 #include "ObjectMgr.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"

 SystemMgr::SystemMgr()
 {
--- a/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.cpp
@@ -21,8 +21,8 @@
 #include "zlib.h"

 #include "AddonHandler.h"
-#include "Database/DatabaseEnv.h"
-#include "Policies/SingletonImp.h"
+#include "DatabaseEnv.h"
+#include "SingletonImp.h"
 #include "Opcodes.h"

 #include "Log.h"
--- a/src/server/game/Server/Protocol/Handlers/AddonHandler.h
+++ b/src/server/game/Server/Protocol/Handlers/AddonHandler.h
@@ -22,8 +22,8 @@
 #define __ADDONHANDLER_H

 #include "Common.h"
-#include "Configuration/ConfigEnv.h"
-#include "Policies/Singleton.h"
+#include "ConfigEnv.h"
+#include "Singleton.h"

 #include "WorldPacket.h"

--- a/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ArenaTeamHandler.cpp
@@ -22,7 +22,7 @@
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"

 #include "ArenaTeam.h"
 #include "Log.h"
--- a/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ChannelHandler.cpp
@@ -18,7 +18,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"

 #include "ObjectMgr.h"                                      // for normalizePlayerName
 #include "ChannelMgr.h"
--- a/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/CharacterHandler.cpp
@@ -26,8 +26,8 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "MD5.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/DatabaseImpl.h"
+#include "DatabaseEnv.h"
+#include "DatabaseImpl.h"

 #include "ArenaTeam.h"
 #include "Chat.h"
--- a/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
@@ -24,7 +24,7 @@
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"

 #include "CellImpl.h"
 #include "Chat.h"
--- a/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/GroupHandler.cpp
@@ -19,7 +19,7 @@
 */

 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Opcodes.h"
 #include "Log.h"
 #include "WorldPacket.h"
--- a/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/MiscHandler.cpp
@@ -20,8 +20,8 @@

 #include "Common.h"
 #include "Language.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/DatabaseImpl.h"
+#include "DatabaseEnv.h"
+#include "DatabaseImpl.h"
 #include "WorldPacket.h"
 #include "Opcodes.h"
 #include "Log.h"
--- a/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/NPCHandler.cpp
@@ -20,7 +20,7 @@

 #include "Common.h"
 #include "Language.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Opcodes.h"
--- a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp
@@ -20,8 +20,8 @@

 #include "Common.h"
 #include "Language.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/DatabaseImpl.h"
+#include "DatabaseEnv.h"
+#include "DatabaseImpl.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Opcodes.h"
@@ -536,4 +536,4 @@ void WorldSession::HandleQuestPOIQuery(WorldPacket& recv_data)
    }

    SendPacket(&data);
-}
+}
--- a/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/SkillHandler.cpp
@@ -19,7 +19,7 @@
 */

 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Opcodes.h"
 #include "Log.h"
 #include "Player.h"
--- a/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp
+++ b/src/server/game/Server/Protocol/Handlers/TaxiHandler.cpp
@@ -19,7 +19,7 @@
 */

 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Opcodes.h"
--- a/src/server/game/Server/Protocol/WorldLog.cpp
+++ b/src/server/game/Server/Protocol/WorldLog.cpp
@@ -23,8 +23,8 @@
 */

 #include "WorldLog.h"
-#include "Policies/SingletonImp.h"
-#include "Configuration/ConfigEnv.h"
+#include "SingletonImp.h"
+#include "ConfigEnv.h"
 #include "Log.h"

 #define CLASS_LOCK Trinity::ClassLevelLockable<WorldLog, ACE_Thread_Mutex>
--- a/src/server/game/Server/Protocol/WorldLog.h
+++ b/src/server/game/Server/Protocol/WorldLog.h
@@ -26,7 +26,7 @@
 #define TRINITY_WORLDLOG_H

 #include "Common.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"
 #include "Errors.h"

 #include <stdarg.h>
--- a/src/server/game/Server/WorldSession.cpp
+++ b/src/server/game/Server/WorldSession.cpp
@@ -24,7 +24,7 @@

 #include "WorldSocket.h"                                    // must be first to make ACE happy with ACE includes in it
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "Opcodes.h"
 #include "WorldPacket.h"
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -38,7 +38,7 @@
 #include "SharedDefines.h"
 #include "ByteBuffer.h"
 #include "Opcodes.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "BigNumber.h"
 #include "SHA1.h"
 #include "WorldSession.h"
--- a/src/server/game/Server/WorldSocket.h
+++ b/src/server/game/Server/WorldSocket.h
@@ -43,7 +43,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */

 #include "Common.h"
-#include "Cryptography/Authentication/AuthCrypt.h"
+#include "AuthCrypt.h"

 class ACE_Message_Block;
 class WorldPacket;
--- a/src/server/game/Server/WorldSocketMgr.cpp
+++ b/src/server/game/Server/WorldSocketMgr.cpp
@@ -42,8 +42,8 @@

 #include "Log.h"
 #include "Common.h"
-#include "Configuration/ConfigEnv.h"
-#include "Database/DatabaseEnv.h"
+#include "ConfigEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldSocket.h"

 /**
--- a/src/server/game/Skills/SkillDiscovery.cpp
+++ b/src/server/game/Skills/SkillDiscovery.cpp
@@ -18,10 +18,10 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */

-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "ProgressBar.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "World.h"
 #include "Util.h"
 #include "SkillDiscovery.h"
--- a/src/server/game/Skills/SkillExtraItems.cpp
+++ b/src/server/game/Skills/SkillExtraItems.cpp
@@ -19,7 +19,7 @@
 */

 #include "SkillExtraItems.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "Log.h"
 #include "ProgressBar.h"
 #include "Player.h"
--- a/src/server/game/Spells/Auras/SpellEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellEffects.cpp
@@ -19,7 +19,7 @@
 */

 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "Opcodes.h"
 #include "Log.h"
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -19,7 +19,7 @@
 */

 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "GridNotifiers.h"
@@ -41,7 +41,7 @@
 #include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "CellImpl.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "SharedDefines.h"
 #include "LootMgr.h"
 #include "VMapFactory.h"
--- a/src/server/game/Tools/PlayerDump.cpp
+++ b/src/server/game/Tools/PlayerDump.cpp
@@ -20,8 +20,8 @@

 #include "Common.h"
 #include "PlayerDump.h"
-#include "Database/DatabaseEnv.h"
-#include "Database/SQLStorage.h"
+#include "DatabaseEnv.h"
+#include "SQLStorage.h"
 #include "UpdateFields.h"
 #include "ObjectMgr.h"

--- a/src/server/game/World/TimeMgr.cpp
+++ b/src/server/game/World/TimeMgr.cpp
@@ -17,7 +17,7 @@
 */

 #include "TimeMgr.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"

 INSTANTIATE_SINGLETON_1(GameTime);

--- a/src/server/game/World/TimeMgr.h
+++ b/src/server/game/World/TimeMgr.h
@@ -20,7 +20,7 @@
 #define _TIMEMGR_H

 #include "Timer.h"
-#include "Policies/Singleton.h"
+#include "Singleton.h"

 struct IntervalTimer
 {
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -23,8 +23,8 @@
 */

 #include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "Configuration/ConfigEnv.h"
+#include "DatabaseEnv.h"
+#include "ConfigEnv.h"
 #include "SystemConfig.h"
 #include "Log.h"
 #include "Opcodes.h"
@@ -48,7 +48,7 @@
 #include "ItemEnchantmentMgr.h"
 #include "MapManager.h"
 #include "CreatureAIRegistry.h"
-#include "Policies/SingletonImp.h"
+#include "SingletonImp.h"
 #include "BattleGroundMgr.h"
 #include "OutdoorPvPMgr.h"
 #include "TemporarySummon.h"
@@ -58,7 +58,7 @@
 #include "GlobalEvents.h"
 #include "GameEventMgr.h"
 #include "PoolHandler.h"
-#include "Database/DatabaseImpl.h"
+#include "DatabaseImpl.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
 #include "InstanceSaveMgr.h"