*Including style fixing - part 1

--HG--
branch : trunk

src/game/AccountMgr.cpp

@@ -18,11 +18,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "AccountMgr.h"
 #include "Database/DatabaseEnv.h"
+#include "Policies/SingletonImp.h"
+
+#include "AccountMgr.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
-#include "Policies/SingletonImp.h"
 #include "Util.h"
 
 extern DatabaseType LoginDatabase;

src/game/AccountMgr.h

@@ -21,9 +21,10 @@
 #ifndef _ACCMGR_H
 #define _ACCMGR_H
 
+#include <string>
+
 #include "Common.h"
 #include "Policies/Singleton.h"
-#include <string>
 
 enum AccountOpResult
 {

src/game/AchievementMgr.cpp

@@ -16,25 +16,27 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "AchievementMgr.h"
 #include "Common.h"
-#include "Player.h"
-#include "WorldPacket.h"
 #include "DBCEnums.h"
-#include "GameEventMgr.h"
 #include "ObjectMgr.h"
-#include "Guild.h"
-#include "Database/DatabaseEnv.h"
 #include "World.h"
-#include "SpellMgr.h"
+#include "WorldPacket.h"
-#include "ArenaTeam.h"
+#include "Database/DatabaseEnv.h"
-#include "ProgressBar.h"
-#include "GridNotifiersImpl.h"
-#include "CellImpl.h"
-#include "Language.h"
-
 #include "Policies/SingletonImp.h"
 
+#include "AchievementMgr.h"
+#include "ArenaTeam.h"
+#include "CellImpl.h"
+#include "GameEventMgr.h"
+#include "GridNotifiersImpl.h"
+#include "Guild.h"
+#include "Language.h"
+#include "Player.h"
+#include "ProgressBar.h"
+#include "SpellMgr.h"
+
+
+
 INSTANTIATE_SINGLETON_1(AchievementGlobalMgr);
 
 namespace MaNGOS

src/game/AchievementMgr.h

@@ -18,15 +18,15 @@
 #ifndef __MANGOS_ACHIEVEMENTMGR_H
 #define __MANGOS_ACHIEVEMENTMGR_H
 
+#include <map>
+#include <string>
+
 #include "Common.h"
 #include "Policies/Singleton.h"
 #include "Database/DatabaseEnv.h"
 #include "DBCEnums.h"
 #include "DBCStores.h"
 
-#include <map>
-#include <string>
-
 typedef std::list<AchievementCriteriaEntry const*> AchievementCriteriaEntryList;
 typedef std::list<AchievementEntry const*>         AchievementEntryList;
 

src/game/AddonHandler.cpp

@@ -18,12 +18,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include "zlib/zlib.h"
+
 #include "AddonHandler.h"
 #include "Database/DatabaseEnv.h"
-#include "Opcodes.h"
-#include "Log.h"
 #include "Policies/SingletonImp.h"
-#include "zlib/zlib.h"
+#include "Opcodes.h"
+
+#include "Log.h"
 
 INSTANTIATE_SINGLETON_1( AddonHandler );
 

src/game/AddonHandler.h

@@ -22,9 +22,10 @@
 #define __ADDONHANDLER_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
-#include "WorldPacket.h"
 #include "Config/ConfigEnv.h"
+#include "Policies/Singleton.h"
+
+#include "WorldPacket.h"
 
 class AddonHandler
 {

src/game/ArenaTeam.cpp

@@ -16,8 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "WorldPacket.h"
 #include "ObjectMgr.h"
+#include "WorldPacket.h"
+
 #include "ArenaTeam.h"
 
 ArenaTeam::ArenaTeam()

src/game/ArenaTeamHandler.cpp

@@ -18,14 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "WorldSession.h"
-#include "WorldPacket.h"
-#include "Log.h"
-#include "Database/DatabaseEnv.h"
 #include "Player.h"
-#include "ObjectMgr.h"
-#include "ArenaTeam.h"
 #include "World.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
+#include "Database/DatabaseEnv.h"
+
+#include "ArenaTeam.h"
+#include "Log.h"
+#include "ObjectMgr.h"
 #include "SocialMgr.h"
 
 void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recv_data)

src/game/AuctionHouseBot.cpp

@@ -1,17 +1,19 @@
-#include "AuctionHouseBot.h"
-#include "Bag.h"
-#include "Config/ConfigEnv.h"
-#include "Database/DatabaseEnv.h"
-#include "Item.h"
-#include "Log.h"
-#include "ObjectMgr.h"
-#include "AuctionHouseMgr.h"
-#include "Player.h"
-#include "World.h"
-#include "WorldSession.h"
-#include "time.h"
 #include <vector>
 #include <iostream>
+#include "time.h"
+
+#include "ObjectMgr.h"
+#include "World.h"
+#include "WorldSession.h"
+#include "Config/ConfigEnv.h"
+#include "Database/DatabaseEnv.h"
+
+#include "AuctionHouseBot.h"
+#include "AuctionHouseMgr.h"
+#include "Bag.h"
+#include "Item.h"
+#include "Log.h"
+#include "Player.h"
 
 using namespace std;
 

src/game/AuctionHouseBot.h

@@ -1,8 +1,11 @@
 #ifndef AUCTION_HOUSE_BOT_H
 #define AUCTION_HOUSE_BOT_H
+
 #include "Common.h"
-#include "Log.h"
 #include "Config/ConfigEnv.h"
+
+#include "Log.h"
+
 #define AHB_GREY        0
 #define AHB_WHITE       1
 #define AHB_GREEN       2

src/game/AuctionHouseHandler.cpp

@@ -18,17 +18,19 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "WorldPacket.h"
-#include "WorldSession.h"
-#include "Opcodes.h"
-#include "Log.h"
-#include "World.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "UpdateMask.h"
+#include "World.h"
-#include "AuctionHouseMgr.h"
+#include "WorldPacket.h"
-#include "Util.h"
+#include "WorldSession.h"
+
 #include "AuctionHouseBot.h"
+#include "AuctionHouseMgr.h"
+#include "Log.h"
+#include "Opcodes.h"
+#include "UpdateMask.h"
+#include "Util.h"
+
 
 //please DO NOT use iterator++, because it is slower than ++iterator!!!
 //post-incrementation is always slower than pre-incrementation !

src/game/AuctionHouseMgr.cpp

@@ -17,23 +17,23 @@
  */
 
 #include "Common.h"
+#include "ObjectMgr.h"
+#include "Player.h"
+#include "World.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
 #include "Database/DatabaseEnv.h"
 #include "Database/SQLStorage.h"
+#include "Policies/SingletonImp.h"
 #include "DBCStores.h"
-#include "ProgressBar.h"
 
 #include "AccountMgr.h"
 #include "AuctionHouseMgr.h"
 #include "Item.h"
 #include "Language.h"
 #include "Log.h"
-#include "ObjectMgr.h"
+#include "ProgressBar.h"
-#include "Player.h"
-#include "World.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
 
-#include "Policies/SingletonImp.h"
 
 INSTANTIATE_SINGLETON_1( AuctionHouseMgr );
 

src/game/AuctionHouseMgr.h

@@ -21,9 +21,10 @@
 #ifndef _AUCTION_HOUSE_MGR_H
 #define _AUCTION_HOUSE_MGR_H
 
-#include "SharedDefines.h"
 #include "Policies/Singleton.h"
 
+#include "SharedDefines.h"
+
 class Item;
 class Player;
 class WorldPacket;

src/game/Bag.cpp

@@ -19,9 +19,10 @@
  */
 
 #include "Common.h"
-#include "Bag.h"
 #include "ObjectMgr.h"
 #include "Database/DatabaseEnv.h"
+
+#include "Bag.h"
 #include "Log.h"
 #include "UpdateData.h"
 

src/game/Bag.h

@@ -24,8 +24,8 @@
 // Maximum 36 Slots ( (CONTAINER_END - CONTAINER_FIELD_SLOT_1)/2
 #define MAX_BAG_SIZE 36                                     // 2.0.12
 
-#include "ItemPrototype.h"
 #include "Item.h"
+#include "ItemPrototype.h"
 
 class Bag : public Item
 {

src/game/BattleGround.cpp

@@ -18,22 +18,24 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Object.h"
 #include "Player.h"
+#include "ObjectMgr.h"
+#include "World.h"
+#include "WorldPacket.h"
+
+#include "ArenaTeam.h"
 #include "BattleGround.h"
 #include "BattleGroundMgr.h"
 #include "Creature.h"
-#include "MapManager.h"
-#include "Language.h"
-#include "SpellAuras.h"
-#include "ArenaTeam.h"
-#include "World.h"
-#include "Group.h"
-#include "ObjectMgr.h"
-#include "WorldPacket.h"
-#include "Util.h"
 #include "Formulas.h"
 #include "GridNotifiersImpl.h"
+#include "Group.h"
+#include "Language.h"
+#include "MapManager.h"
+#include "Object.h"
+#include "SpellAuras.h"
+#include "Util.h"
+
 
 namespace MaNGOS
 {

src/game/BattleGroundAA.cpp

@@ -18,10 +18,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundAA.h"
 #include "Language.h"
+#include "Player.h"
 
 BattleGroundAA::BattleGroundAA()
 {

src/game/BattleGroundAB.cpp

@@ -18,16 +18,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Object.h"
+#include "ObjectMgr.h"
-#include "Player.h"
+#include "World.h"
+#include "WorldPacket.h"
+
 #include "BattleGround.h"
 #include "BattleGroundAB.h"
 #include "Creature.h"
-#include "ObjectMgr.h"
 #include "Language.h"
-#include "World.h"
+#include "Object.h"
+#include "Player.h"
 #include "Util.h"
-#include "WorldPacket.h"
 
 // these variables aren't used outside of this file, so declare them only here
 uint32 BG_AB_HonorScoreTicks[BG_HONOR_MODE_NUM] = {

src/game/BattleGroundAV.cpp

@@ -18,15 +18,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Player.h"
+#include "ObjectMgr.h"
+#include "WorldPacket.h"
+
 #include "BattleGround.h"
 #include "BattleGroundAV.h"
-#include "Language.h"
-#include "SpellAuras.h"
 #include "Formulas.h"
-#include "WorldPacket.h"
-#include "ObjectMgr.h"
 #include "GameObject.h"
+#include "Language.h"
+#include "Player.h"
+#include "SpellAuras.h"
 
 BattleGroundAV::BattleGroundAV()
 {

src/game/BattleGroundBE.cpp

@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Object.h"
-#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundBE.h"
-#include "ObjectMgr.h"
-#include "WorldPacket.h"
 #include "Language.h"
+#include "Object.h"
+#include "ObjectMgr.h"
+#include "Player.h"
+#include "WorldPacket.h"
 
 BattleGroundBE::BattleGroundBE()
 {

src/game/BattleGroundDS.cpp

@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundDS.h"
 #include "Language.h"
+#include "Player.h"
 
 BattleGroundDS::BattleGroundDS()
 {

src/game/BattleGroundEY.cpp

@@ -18,15 +18,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Object.h"
+#include "ObjectMgr.h"
-#include "Player.h"
+#include "World.h"
+#include "WorldPacket.h"
+
 #include "BattleGround.h"
 #include "BattleGroundEY.h"
 #include "Creature.h"
-#include "ObjectMgr.h"
 #include "Language.h"
-#include "World.h" //music
+#include "Object.h"
-#include "WorldPacket.h"
+#include "Player.h"
 #include "Util.h"
 
 // these variables aren't used outside of this file, so declare them only here

src/game/BattleGroundHandler.cpp

@@ -19,20 +19,21 @@
  */
 
 #include "Common.h"
-#include "WorldPacket.h"
-#include "Opcodes.h"
-#include "Log.h"
-#include "Player.h"
-#include "ObjectMgr.h"
-#include "WorldSession.h"
 #include "ObjectAccessor.h"
-#include "Object.h"
+#include "ObjectMgr.h"
-#include "Chat.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
+
+#include "ArenaTeam.h"
 #include "BattleGroundMgr.h"
 #include "BattleGroundWS.h"
 #include "BattleGround.h"
-#include "ArenaTeam.h"
+#include "Chat.h"
 #include "Language.h"
+#include "Log.h"
+#include "Player.h"
+#include "Object.h"
+#include "Opcodes.h"
 
 void WorldSession::HandleBattlemasterHelloOpcode( WorldPacket & recv_data )
 {

src/game/BattleGroundMgr.cpp

@@ -19,8 +19,12 @@
  */
 
 #include "Common.h"
-#include "SharedDefines.h"
+#include "ObjectMgr.h"
-#include "Player.h"
+#include "World.h"
+#include "WorldPacket.h"
+#include "Policies/SingletonImp.h"
+
+#include "ArenaTeam.h"
 #include "BattleGroundMgr.h"
 #include "BattleGroundAV.h"
 #include "BattleGroundAB.h"
@@ -33,18 +37,13 @@
 #include "BattleGroundSA.h"
 #include "BattleGroundDS.h"
 #include "BattleGroundRV.h"
-#include "MapManager.h"
+#include "Chat.h"
 #include "Map.h"
 #include "MapInstanced.h"
-#include "ObjectMgr.h"
+#include "MapManager.h"
+#include "Player.h"
 #include "ProgressBar.h"
-#include "Chat.h"
+#include "SharedDefines.h"
-#include "ArenaTeam.h"
-#include "World.h"
-#include "WorldPacket.h"
-#include "ProgressBar.h"
-
-#include "Policies/SingletonImp.h"
 
 INSTANTIATE_SINGLETON_1( BattleGroundMgr );
 

src/game/BattleGroundMgr.h

@@ -23,6 +23,7 @@
 
 #include "Common.h"
 #include "Policies/Singleton.h"
+
 #include "BattleGround.h"
 
 typedef std::map<uint32, BattleGround*> BattleGroundSet;

src/game/BattleGroundNA.cpp

@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Object.h"
-#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundNA.h"
-#include "ObjectMgr.h"
-#include "WorldPacket.h"
 #include "Language.h"
+#include "Object.h"
+#include "ObjectMgr.h"
+#include "Player.h"
+#include "WorldPacket.h"
 
 BattleGroundNA::BattleGroundNA()
 {

src/game/BattleGroundRL.cpp

@@ -18,12 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Object.h"
+
-#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundRL.h"
-#include "ObjectMgr.h"
 #include "Language.h"
+#include "Object.h"
+#include "ObjectMgr.h"
+#include "Player.h"
 #include "WorldPacket.h"
 
 BattleGroundRL::BattleGroundRL()

src/game/BattleGroundRV.cpp

@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundRV.h"
 #include "Language.h"
+#include "Player.h"
 
 BattleGroundRV::BattleGroundRV()
 {

src/game/BattleGroundSA.cpp

@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundSA.h"
 #include "Language.h"
+#include "Player.h"
 
 BattleGroundSA::BattleGroundSA()
 {

src/game/BattleGroundWS.cpp

@@ -18,16 +18,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Object.h"
-#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundWS.h"
 #include "Creature.h"
 #include "GameObject.h"
-#include "ObjectMgr.h"
-#include "WorldPacket.h"
 #include "Language.h"
+#include "Object.h"
+#include "ObjectMgr.h"
+#include "Player.h"
 #include "World.h"
+#include "WorldPacket.h"
 
 // these variables aren't used outside of this file, so declare them only here
 enum BG_WSG_Rewards

src/game/CalendarHandler.cpp

@@ -17,12 +17,13 @@
  */
 
 #include "Common.h"
-#include "Log.h"
-#include "Player.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Opcodes.h"
+
 #include "InstanceSaveMgr.h"
+#include "Log.h"
+#include "Opcodes.h"
+#include "Player.h"
 
 void WorldSession::HandleCalendarGetCalendar(WorldPacket &recv_data)
 {

src/game/Cell.h

@@ -21,10 +21,12 @@
 #ifndef TRINITY_CELL_H
 #define TRINITY_CELL_H
 
+#include <cmath>
+
 #include "GameSystem/TypeContainer.h"
 #include "GameSystem/TypeContainerVisitor.h"
+
 #include "GridDefines.h"
-#include <cmath>
 
 class Map;
 

src/game/CellImpl.h

@@ -21,9 +21,10 @@
 #ifndef TRINITY_CELLIMPL_H
 #define TRINITY_CELLIMPL_H
 
+#include <cmath>
+
 #include "Cell.h"
 #include "Map.h"
-#include <cmath>
 
 inline Cell::Cell(CellPair const& p)
 {

src/game/Channel.cpp

@@ -20,8 +20,8 @@
 
 #include "Channel.h"
 #include "ObjectMgr.h"
-#include "World.h"
 #include "SocialMgr.h"
+#include "World.h"
 
 Channel::Channel(const std::string& name, uint32 channel_id)
 : m_announce(true), m_moderate(false), m_name(name), m_flags(0), m_channelId(channel_id), m_ownerGUID(0)

src/game/Channel.h

@@ -21,15 +21,16 @@
 #ifndef _CHANNEL_H
 #define _CHANNEL_H
 
-#include "Common.h"
-#include "WorldPacket.h"
-#include "Opcodes.h"
-#include "Player.h"
-
 #include <list>
 #include <map>
 #include <string>
 
+#include "Common.h"
+
+#include "Opcodes.h"
+#include "Player.h"
+#include "WorldPacket.h"
+
 enum ChatNotify
 {
     CHAT_JOINED_NOTICE                = 0x00,           //+ "%s joined channel.";

src/game/ChannelHandler.cpp

@@ -18,9 +18,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+
+#include "Policies/SingletonImp.h"
+
 #include "ObjectMgr.h"                                      // for normalizePlayerName
 #include "ChannelMgr.h"
-#include "Policies/SingletonImp.h"
 
 INSTANTIATE_SINGLETON_1( AllianceChannelMgr );
 INSTANTIATE_SINGLETON_1( HordeChannelMgr );

src/game/ChannelMgr.h

@@ -20,13 +20,14 @@
 #ifndef TRINITYCORE_CHANNELMGR_H
 #define TRINITYCORE_CHANNELMGR_H
 
-#include "Channel.h"
-#include "Policies/Singleton.h"
-#include "World.h"
-
 #include <map>
 #include <string>
 
+#include "Policies/Singleton.h"
+
+#include "Channel.h"
+#include "World.h"
+
 class ChannelMgr
 {
     public:

src/game/CharacterHandler.cpp

@@ -19,28 +19,29 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "WorldPacket.h"
-#include "SharedDefines.h"
-#include "WorldSession.h"
-#include "Opcodes.h"
-#include "Log.h"
-#include "World.h"
-#include "ObjectMgr.h"
-#include "Player.h"
-#include "Guild.h"
-#include "UpdateMask.h"
-#include "Auth/md5.h"
 #include "ObjectAccessor.h"
-#include "Group.h"
+#include "ObjectMgr.h"
-#include "Database/DatabaseImpl.h"
-#include "PlayerDump.h"
-#include "SocialMgr.h"
-#include "Util.h"
-#include "ArenaTeam.h"
-#include "Language.h"
-#include "Chat.h"
 #include "SystemConfig.h"
+#include "World.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
+#include "Auth/md5.h"
+#include "Database/DatabaseEnv.h"
+#include "Database/DatabaseImpl.h"
+
+#include "ArenaTeam.h"
+#include "Chat.h"
+#include "Group.h"
+#include "Guild.h"
+#include "Language.h"
+#include "Log.h"
+#include "Opcodes.h"
+#include "Player.h"
+#include "PlayerDump.h"
+#include "SharedDefines.h"
+#include "SocialMgr.h"
+#include "UpdateMask.h"
+#include "Util.h"
 
 class LoginQueryHolder : public SqlQueryHolder
 {

src/game/Chat.cpp

@@ -19,20 +19,21 @@
  */
 
 #include "Common.h"
-#include "Language.h"
+#include "ObjectMgr.h"
-#include "Database/DatabaseEnv.h"
+#include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Opcodes.h"
+#include "Database/DatabaseEnv.h"
-#include "Log.h"
+
-#include "World.h"
+#include "AccountMgr.h"
-#include "ObjectMgr.h"
+#include "CellImpl.h"
-#include "Player.h"
-#include "UpdateMask.h"
 #include "Chat.h"
 #include "GridNotifiersImpl.h"
-#include "CellImpl.h"
+#include "Language.h"
-#include "AccountMgr.h"
+#include "Log.h"
+#include "Opcodes.h"
+#include "Player.h"
+#include "UpdateMask.h"
 #include "TicketMgr.h"
 
 // Supported shift-links (client generated and server side)

src/game/ChatHandler.cpp

@@ -19,25 +19,26 @@
  */
 
 #include "Common.h"
-#include "Log.h"
+#include "ObjectAccessor.h"
+#include "ObjectMgr.h"
+#include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "World.h"
-#include "Opcodes.h"
-#include "ObjectMgr.h"
-#include "Chat.h"
 #include "Database/DatabaseEnv.h"
+
+#include "CellImpl.h"
+#include "Chat.h"
 #include "ChannelMgr.h"
+#include "GridNotifiersImpl.h"
 #include "Group.h"
 #include "Guild.h"
-#include "ObjectAccessor.h"
-#include "ScriptCalls.h"
-#include "Player.h"
-#include "SpellAuras.h"
 #include "Language.h"
+#include "Log.h"
+#include "Opcodes.h"
+#include "Player.h"
+#include "ScriptCalls.h"
+#include "SpellAuras.h"
 #include "Util.h"
-#include "GridNotifiersImpl.h"
-#include "CellImpl.h"
 
 void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
 {

src/trinitycore/CliRunnable.cpp

@@ -23,19 +23,20 @@
 /// \file
 
 #include "Common.h"
-#include "Language.h"
-#include "Log.h"
-#include "World.h"
-#include "ScriptCalls.h"
 #include "ObjectMgr.h"
+#include "World.h"
 #include "WorldSession.h"
 #include "Config/ConfigEnv.h"
-#include "Util.h"
+
 #include "AccountMgr.h"
+#include "Chat.h"
 #include "CliRunnable.h"
+#include "Language.h"
+#include "Log.h"
 #include "MapManager.h"
 #include "Player.h"
-#include "Chat.h"
+#include "ScriptCalls.h"
+#include "Util.h"
 
 void utf8print(const char* str)
 {

src/trinitycore/Main.cpp

@@ -22,13 +22,16 @@
 /// @{
 /// \file
 
+#include <openssl/opensslv.h>
+#include <openssl/crypto.h>
+
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "Config/ConfigEnv.h"
+
 #include "Log.h"
 #include "Master.h"
-#include <openssl/opensslv.h>
+
-#include <openssl/crypto.h>
 
 #ifndef _TRINITY_CORE_CONFIG
 # define _TRINITY_CORE_CONFIG  "TrinityCore.conf"

src/trinitycore/Master.cpp

@@ -24,21 +24,22 @@
 
 #include <ace/OS_NS_signal.h>
 
-#include "WorldSocketMgr.h"
 #include "Common.h"
-#include "Master.h"
-#include "WorldSocket.h"
-#include "WorldRunnable.h"
-#include "World.h"
-#include "Log.h"
-#include "Timer.h"
-#include "Policies/SingletonImp.h"
 #include "SystemConfig.h"
+#include "World.h"
+#include "WorldRunnable.h"
+#include "WorldSocket.h"
+#include "WorldSocketMgr.h"
 #include "Config/ConfigEnv.h"
 #include "Database/DatabaseEnv.h"
+#include "Policies/SingletonImp.h"
+
 #include "CliRunnable.h"
+#include "Log.h"
+#include "Master.h"
 #include "RASocket.h"
 #include "ScriptCalls.h"
+#include "Timer.h"
 #include "Util.h"
 
 #include "sockets/TcpSocket.h"

src/trinitycore/RASocket.cpp

@@ -23,13 +23,14 @@
 */
 
 #include "Common.h"
+#include "Config/ConfigEnv.h"
 #include "Database/DatabaseEnv.h"
+
+#include "AccountMgr.h"
 #include "Log.h"
 #include "RASocket.h"
-#include "World.h"
-#include "Config/ConfigEnv.h"
 #include "Util.h"
-#include "AccountMgr.h"
+#include "World.h"
 
 /// \todo Make this thread safe if in the future 2 admins should be able to log at the same time.
 SOCKET r;

src/trinitycore/RASocket.h

@@ -25,9 +25,10 @@
 #ifndef _RASOCKET_H
 #define _RASOCKET_H
 
-#include "Common.h"
 #include "sockets/TcpSocket.h"
 
+#include "Common.h"
+
 #define RA_BUFF_SIZE 1024
 
 class ISocketHandler;

src/trinitycore/WorldRunnable.cpp

@@ -22,17 +22,17 @@
     \ingroup Trinityd
 */
 
-#include "WorldSocketMgr.h"
 #include "Common.h"
-#include "World.h"
-#include "WorldRunnable.h"
-#include "Timer.h"
 #include "ObjectAccessor.h"
-#include "MapManager.h"
+#include "World.h"
-#include "BattleGroundMgr.h"
+#include "WorldSocketMgr.h"
-
 #include "Database/DatabaseEnv.h"
 
+#include "BattleGroundMgr.h"
+#include "MapManager.h"
+#include "Timer.h"
+#include "WorldRunnable.h"
+
 #if (defined(WIN32) || defined(SHORT_SLEEP))
 #define WORLD_SLEEP_CONST 50
 #else

src/trinityrealm/AuthSocket.cpp

@@ -21,17 +21,19 @@
 /** \file
     \ingroup realmd
 */
+#include <openssl/md5.h>
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "Auth/Sha1.h"
-#include "ByteBuffer.h"
 #include "Config/ConfigEnv.h"
+#include "Database/DatabaseEnv.h"
+
+#include "AuthCodes.h"
+#include "AuthSocket.h"
+#include "ByteBuffer.h"
 #include "Log.h"
 #include "RealmList.h"
-#include "AuthSocket.h"
+
-#include "AuthCodes.h"
-#include <openssl/md5.h>
-#include "Auth/Sha1.h"
 //#include "Util.h" -- for commented utf8ToUpperOnlyLatin
 
 extern RealmList m_realmList;

src/trinityrealm/AuthSocket.h

@@ -25,8 +25,6 @@
 #ifndef _AUTHSOCKET_H
 #define _AUTHSOCKET_H
 
-#include "Common.h"
-#include "Auth/BigNumber.h"
 #include "sockets/TcpSocket.h"
 #include "sockets/SocketHandler.h"
 #include "sockets/ListenSocket.h"
@@ -34,6 +32,9 @@
 #include "sockets/Parse.h"
 #include "sockets/Socket.h"
 
+#include "Common.h"
+#include "Auth/BigNumber.h"
+
 /// Handle login commands
 class AuthSocket: public TcpSocket
 {

src/trinityrealm/Main.cpp

@@ -22,19 +22,20 @@
 /// @{
 /// \file
 
-#include "Common.h"
-#include "Database/DatabaseEnv.h"
-#include "RealmList.h"
-
-#include "Config/ConfigEnv.h"
-#include "Log.h"
-#include "sockets/ListenSocket.h"
-#include "AuthSocket.h"
-#include "SystemConfig.h"
-#include "Util.h"
 #include <openssl/opensslv.h>
 #include <openssl/crypto.h>
 
+#include "Common.h"
+#include "Config/ConfigEnv.h"
+#include "Database/DatabaseEnv.h"
+#include "sockets/ListenSocket.h"
+
+#include "AuthSocket.h"
+#include "Log.h"
+#include "RealmList.h"
+#include "SystemConfig.h"
+#include "Util.h"
+
 // Format is YYYYMMDDRR where RR is the change in the conf file
 // for that day.
 #ifndef _REALMDCONFVERSION

src/trinityrealm/RealmList.cpp

@@ -23,9 +23,10 @@
 */
 
 #include "Common.h"
-#include "RealmList.h"
-#include "Policies/SingletonImp.h"
 #include "Database/DatabaseEnv.h"
+#include "Policies/SingletonImp.h"
+
+#include "RealmList.h"
 
 INSTANTIATE_SINGLETON_1( RealmList );