From 69881a0d864f9db2f6a6ab1111d61638b651ad73 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 15 Sep 2013 20:35:51 +0300 Subject: remove unused includes from net directory. --- src/net/charserverhandler.h | 1 - src/net/download.cpp | 1 - src/net/download.h | 2 -- src/net/ea/adminhandler.cpp | 1 + src/net/ea/adminhandler.h | 3 ++- src/net/ea/beinghandler.cpp | 9 --------- src/net/ea/beinghandler.h | 1 - src/net/ea/buysellhandler.cpp | 8 ++++---- src/net/ea/buysellhandler.h | 4 ---- src/net/ea/charserverhandler.cpp | 2 ++ src/net/ea/charserverhandler.h | 4 +--- src/net/ea/chathandler.h | 2 -- src/net/ea/gamehandler.h | 1 - src/net/ea/gui/guildtab.cpp | 5 ----- src/net/ea/gui/partytab.cpp | 7 +------ src/net/ea/itemhandler.h | 1 - src/net/ea/loginhandler.h | 1 - src/net/ea/network.cpp | 4 ---- src/net/ea/network.h | 4 ---- src/net/ea/npchandler.h | 3 --- src/net/ea/partyhandler.h | 1 - src/net/ea/playerhandler.cpp | 2 +- src/net/ea/playerhandler.h | 1 - src/net/ea/skillhandler.cpp | 4 +--- src/net/ea/skillhandler.h | 1 - src/net/ea/tradehandler.cpp | 1 + src/net/ea/tradehandler.h | 1 - src/net/eathena/adminhandler.cpp | 7 +------ src/net/eathena/adminhandler.h | 3 --- src/net/eathena/beinghandler.cpp | 12 +----------- src/net/eathena/beinghandler.h | 3 --- src/net/eathena/buysellhandler.cpp | 12 ------------ src/net/eathena/buysellhandler.h | 2 -- src/net/eathena/charserverhandler.cpp | 6 ++---- src/net/eathena/charserverhandler.h | 6 ------ src/net/eathena/chathandler.cpp | 8 -------- src/net/eathena/chathandler.h | 4 +--- src/net/eathena/gamehandler.cpp | 4 +++- src/net/eathena/gamehandler.h | 3 --- src/net/eathena/generalhandler.cpp | 7 ------- src/net/eathena/generalhandler.h | 1 - src/net/eathena/gui/guildtab.cpp | 13 ------------- src/net/eathena/gui/partytab.cpp | 15 --------------- src/net/eathena/guildhandler.cpp | 2 +- src/net/eathena/guildhandler.h | 2 -- src/net/eathena/inventoryhandler.cpp | 1 + src/net/eathena/inventoryhandler.h | 4 ---- src/net/eathena/loginhandler.cpp | 3 +-- src/net/eathena/loginhandler.h | 2 -- src/net/eathena/messagehandler.h | 4 ---- src/net/eathena/messagein.cpp | 1 - src/net/eathena/messagein.h | 3 --- src/net/eathena/messageout.cpp | 1 - src/net/eathena/messageout.h | 3 --- src/net/eathena/network.cpp | 7 +------ src/net/eathena/network.h | 1 - src/net/eathena/npchandler.cpp | 4 +--- src/net/eathena/npchandler.h | 7 ------- src/net/eathena/partyhandler.cpp | 3 +-- src/net/eathena/partyhandler.h | 1 - src/net/eathena/playerhandler.cpp | 7 ++----- src/net/eathena/playerhandler.h | 3 --- src/net/eathena/skillhandler.cpp | 3 +-- src/net/eathena/skillhandler.h | 3 --- src/net/eathena/tradehandler.cpp | 1 + src/net/eathena/tradehandler.h | 3 --- src/net/messagein.cpp | 3 ++- src/net/messagein.h | 2 -- src/net/messageout.h | 3 --- src/net/net.cpp | 14 -------------- src/net/sdltcpnet.h | 2 -- src/net/tmwa/adminhandler.cpp | 7 +------ src/net/tmwa/adminhandler.h | 3 --- src/net/tmwa/beinghandler.cpp | 18 +----------------- src/net/tmwa/beinghandler.h | 3 --- src/net/tmwa/buysellhandler.cpp | 12 ------------ src/net/tmwa/buysellhandler.h | 2 -- src/net/tmwa/charserverhandler.cpp | 6 ++---- src/net/tmwa/charserverhandler.h | 6 ------ src/net/tmwa/chathandler.cpp | 8 -------- src/net/tmwa/chathandler.h | 4 +--- src/net/tmwa/gamehandler.cpp | 4 +++- src/net/tmwa/gamehandler.h | 3 --- src/net/tmwa/generalhandler.cpp | 7 ------- src/net/tmwa/generalhandler.h | 1 - src/net/tmwa/gui/guildtab.cpp | 13 ------------- src/net/tmwa/gui/partytab.cpp | 15 --------------- src/net/tmwa/guildhandler.cpp | 2 +- src/net/tmwa/guildhandler.h | 2 -- src/net/tmwa/inventoryhandler.cpp | 1 + src/net/tmwa/inventoryhandler.h | 4 ---- src/net/tmwa/loginhandler.cpp | 3 +-- src/net/tmwa/loginhandler.h | 4 ---- src/net/tmwa/messagehandler.h | 4 +--- src/net/tmwa/messagein.cpp | 1 - src/net/tmwa/messagein.h | 3 --- src/net/tmwa/messageout.cpp | 1 - src/net/tmwa/messageout.h | 3 --- src/net/tmwa/network.cpp | 7 +------ src/net/tmwa/network.h | 1 - src/net/tmwa/npchandler.cpp | 1 + src/net/tmwa/npchandler.h | 7 ------- src/net/tmwa/partyhandler.cpp | 3 +-- src/net/tmwa/partyhandler.h | 1 - src/net/tmwa/playerhandler.cpp | 6 ++++-- src/net/tmwa/playerhandler.h | 3 --- src/net/tmwa/questhandler.cpp | 6 ------ src/net/tmwa/questhandler.h | 7 ------- src/net/tmwa/skillhandler.cpp | 3 +-- src/net/tmwa/skillhandler.h | 3 --- src/net/tmwa/tradehandler.cpp | 1 + src/net/tmwa/tradehandler.h | 3 --- 112 files changed, 55 insertions(+), 411 deletions(-) diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h index aa05ba7f5..1c53fd3a0 100644 --- a/src/net/charserverhandler.h +++ b/src/net/charserverhandler.h @@ -26,7 +26,6 @@ #include "being/localplayer.h" #include "being/playerinfo.h" -#include #include #include diff --git a/src/net/download.cpp b/src/net/download.cpp index 4d03ea783..71169d207 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -30,7 +30,6 @@ #include -#include #include #include diff --git a/src/net/download.h b/src/net/download.h index d0025c2b3..33f7ae3b3 100644 --- a/src/net/download.h +++ b/src/net/download.h @@ -23,8 +23,6 @@ #ifndef NET_DOWNLOAD_H #define NET_DOWNLOAD_H -#include - #include #include diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp index 5e1c188a0..583239f0c 100644 --- a/src/net/ea/adminhandler.cpp +++ b/src/net/ea/adminhandler.cpp @@ -23,6 +23,7 @@ #include "net/ea/adminhandler.h" #include "net/chathandler.h" +#include "net/net.h" #include diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h index aeaa1154f..f32c02ffd 100644 --- a/src/net/ea/adminhandler.h +++ b/src/net/ea/adminhandler.h @@ -24,7 +24,8 @@ #define NET_EA_ADMINHANDLER_H #include "net/adminhandler.h" -#include "net/net.h" + +#include "localconsts.h" namespace Ea { diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 20b7b23f6..7702a5a9b 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -29,7 +29,6 @@ #include "configuration.h" #include "effectmanager.h" #include "game.h" -#include "guild.h" #include "guildmanager.h" #include "party.h" @@ -38,7 +37,6 @@ #include "particle/particle.h" -#include "input/inputmanager.h" #include "input/keyboardconfig.h" #include "gui/botcheckerwindow.h" @@ -47,16 +45,9 @@ #include "gui/killstats.h" #include "gui/questswindow.h" -#include "utils/gettext.h" - -#include "net/playerhandler.h" - -#include "resources/colordb.h" #include "resources/itemdb.h" #include "resources/iteminfo.h" -#include - #include "debug.h" namespace Ea diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h index 6798726bd..ad57e128e 100644 --- a/src/net/ea/beinghandler.h +++ b/src/net/ea/beinghandler.h @@ -24,7 +24,6 @@ #define NET_EA_BEINGHANDLER_H #include "net/beinghandler.h" -#include "net/net.h" namespace Ea { diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp index 053f54db8..f1eb536fd 100644 --- a/src/net/ea/buysellhandler.cpp +++ b/src/net/ea/buysellhandler.cpp @@ -22,24 +22,24 @@ #include "net/ea/buysellhandler.h" -#include "actorspritemanager.h" #include "client.h" #include "configuration.h" #include "inventory.h" #include "notifications.h" #include "notifymanager.h" -#include "being/localplayer.h" #include "being/playerinfo.h" #include "gui/buydialog.h" +#include "gui/chatwindow.h" #include "gui/buyselldialog.h" #include "gui/selldialog.h" #include "gui/shopwindow.h" -#include "gui/widgets/chattab.h" - #include "net/chathandler.h" +#include "net/net.h" + +#include "net/ea/eaprotocol.h" #include "debug.h" diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h index f46a8dcb4..87bed3d83 100644 --- a/src/net/ea/buysellhandler.h +++ b/src/net/ea/buysellhandler.h @@ -25,10 +25,6 @@ #include "net/buysellhandler.h" -#include "being/being.h" - -#include "net/net.h" - class BuyDialog; namespace Ea diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index f428aea54..7ff7e6eb8 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -33,6 +33,8 @@ #include "net/ea/gamehandler.h" #include "net/ea/network.h" +#include "net/net.h" + #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h index aeb8d2d09..83da865a1 100644 --- a/src/net/ea/charserverhandler.h +++ b/src/net/ea/charserverhandler.h @@ -25,9 +25,7 @@ #include "net/charserverhandler.h" #include "net/messagein.h" -#include "net/net.h" - -class LoginData; +#include "net/serverinfo.h" namespace Ea { diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h index 327a708cd..37e0328ce 100644 --- a/src/net/ea/chathandler.h +++ b/src/net/ea/chathandler.h @@ -25,8 +25,6 @@ #include "net/chathandler.h" #include "net/messagein.h" -#include "net/messageout.h" -#include "net/net.h" #include diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h index 5fe74af68..559a9a860 100644 --- a/src/net/ea/gamehandler.h +++ b/src/net/ea/gamehandler.h @@ -25,7 +25,6 @@ #include "net/gamehandler.h" #include "net/messagein.h" -#include "net/net.h" namespace Ea { diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp index 615d0334b..1cfdd7b90 100644 --- a/src/net/ea/gui/guildtab.cpp +++ b/src/net/ea/gui/guildtab.cpp @@ -28,15 +28,10 @@ #include "soundconsts.h" #include "soundmanager.h" -#include "being/localplayer.h" - #include "net/net.h" #include "net/ea/guildhandler.h" -#include "resources/iteminfo.h" -#include "resources/itemdb.h" - #include "utils/gettext.h" #include "debug.h" diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp index c41fad098..eb4801cbf 100644 --- a/src/net/ea/gui/partytab.cpp +++ b/src/net/ea/gui/partytab.cpp @@ -23,7 +23,7 @@ #include "net/ea/gui/partytab.h" #include "chatlogger.h" -#include "commandhandler.h" +#include "commands.h" #include "party.h" #include "soundconsts.h" #include "soundmanager.h" @@ -33,13 +33,8 @@ #include "net/net.h" #include "net/partyhandler.h" -#include "resources/iteminfo.h" -#include "resources/itemdb.h" - #include "utils/gettext.h" -#include "net/chathandler.h" - #include "debug.h" namespace Ea diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h index 72f64bfb8..8847090f6 100644 --- a/src/net/ea/itemhandler.h +++ b/src/net/ea/itemhandler.h @@ -23,7 +23,6 @@ #ifndef NET_EA_ITEMHANDLER_H #define NET_EA_ITEMHANDLER_H -#include "net/net.h" #include "net/messagein.h" namespace Ea diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h index 0d60a7622..e6dadac2e 100644 --- a/src/net/ea/loginhandler.h +++ b/src/net/ea/loginhandler.h @@ -24,7 +24,6 @@ #define NET_EA_LOGINHANDLER_H #include "net/loginhandler.h" -#include "net/net.h" #include "net/messagein.h" #include "net/ea/token.h" diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp index 92cbb14f8..01270bcbc 100644 --- a/src/net/ea/network.cpp +++ b/src/net/ea/network.cpp @@ -25,10 +25,6 @@ #include "configuration.h" #include "logger.h" -#include "net/messagehandler.h" - -#include "net/eathena/protocol.h" - #include "utils/gettext.h" #include "utils/sdlhelper.h" diff --git a/src/net/ea/network.h b/src/net/ea/network.h index 2f8a1c0d1..81a95566b 100644 --- a/src/net/ea/network.h +++ b/src/net/ea/network.h @@ -25,14 +25,10 @@ #include "net/serverinfo.h" -#include "net/messagein.h" -#include "net/messageout.h" - #include "net/sdltcpnet.h" #include -#include #include namespace Ea diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h index 9c50b8c50..714bc594c 100644 --- a/src/net/ea/npchandler.h +++ b/src/net/ea/npchandler.h @@ -24,11 +24,8 @@ #define NET_EA_NPCHANDLER_H #include "net/messagein.h" -#include "net/net.h" #include "net/npchandler.h" -#include - class NpcDialog; namespace Ea diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h index 5b42f557f..4b829f73e 100644 --- a/src/net/ea/partyhandler.h +++ b/src/net/ea/partyhandler.h @@ -23,7 +23,6 @@ #define NET_EA_PARTYHANDLER_H #include "net/messagein.h" -#include "net/net.h" #include "net/partyhandler.h" #include "net/ea/gui/partytab.h" diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index bca770e70..320727e01 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -40,7 +40,7 @@ #include "resources/deaddb.h" -#include "net/npchandler.h" +#include "net/net.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h index e5135ea3d..219ea17f2 100644 --- a/src/net/ea/playerhandler.h +++ b/src/net/ea/playerhandler.h @@ -24,7 +24,6 @@ #define NET_EA_PLAYERHANDLER_H #include "net/messagein.h" -#include "net/net.h" #include "net/playerhandler.h" namespace Ea diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp index 9ec815c53..47dc2c2d4 100644 --- a/src/net/ea/skillhandler.cpp +++ b/src/net/ea/skillhandler.cpp @@ -31,9 +31,7 @@ #include "gui/skilldialog.h" -#include "gui/widgets/chattab.h" - -#include "net/messageout.h" +#include "utils/stringutils.h" #include "debug.h" diff --git a/src/net/ea/skillhandler.h b/src/net/ea/skillhandler.h index 155f81ba7..54566135e 100644 --- a/src/net/ea/skillhandler.h +++ b/src/net/ea/skillhandler.h @@ -24,7 +24,6 @@ #define NET_EA_SKILLHANDLER_H #include "net/messagein.h" -#include "net/net.h" #include "net/skillhandler.h" namespace Ea diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index 6fa76eca5..77f71d75a 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -35,6 +35,7 @@ #include "gui/tradewindow.h" #include "net/inventoryhandler.h" +#include "net/net.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h index 9abc7e84b..98dbd8383 100644 --- a/src/net/ea/tradehandler.h +++ b/src/net/ea/tradehandler.h @@ -24,7 +24,6 @@ #define NET_EA_TRADEHANDLER_H #include "net/messagein.h" -#include "net/net.h" #include "net/tradehandler.h" namespace Ea diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp index 69f03cc61..80263949d 100644 --- a/src/net/eathena/adminhandler.cpp +++ b/src/net/eathena/adminhandler.cpp @@ -22,15 +22,10 @@ #include "net/eathena/adminhandler.h" -#include "actorspritemanager.h" -#include "game.h" #include "notifications.h" #include "notifymanager.h" -#include "being/playerrelations.h" - -#include "net/chathandler.h" - +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" #include diff --git a/src/net/eathena/adminhandler.h b/src/net/eathena/adminhandler.h index 5e8250250..395510027 100644 --- a/src/net/eathena/adminhandler.h +++ b/src/net/eathena/adminhandler.h @@ -23,9 +23,6 @@ #ifndef NET_EATHENA_ADMINHANDLER_H #define NET_EATHENA_ADMINHANDLER_H -#include "net/adminhandler.h" -#include "net/net.h" - #include "net/ea/adminhandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index bc4d6d442..1833c9a87 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -24,34 +24,24 @@ #include "actorspritemanager.h" #include "client.h" -#include "configuration.h" -#include "effectmanager.h" #include "guild.h" #include "guildmanager.h" #include "party.h" #include "being/localplayer.h" -#include "being/playerrelations.h" #include "input/keyboardconfig.h" -#include "gui/botcheckerwindow.h" #include "gui/outfitwindow.h" #include "gui/socialwindow.h" #include "gui/killstats.h" -#include "utils/gettext.h" - -#include "net/playerhandler.h" - +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "resources/colordb.h" #include "resources/itemdb.h" #include "resources/iteminfo.h" -#include - #include "debug.h" extern Net::BeingHandler *beingHandler; diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h index 50ffb1809..15a89d0b6 100644 --- a/src/net/eathena/beinghandler.h +++ b/src/net/eathena/beinghandler.h @@ -23,9 +23,6 @@ #ifndef NET_EATHENA_BEINGHANDLER_H #define NET_EATHENA_BEINGHANDLER_H -#include "net/beinghandler.h" -#include "net/net.h" - #include "net/ea/beinghandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp index 76f465872..44c8eb125 100644 --- a/src/net/eathena/buysellhandler.cpp +++ b/src/net/eathena/buysellhandler.cpp @@ -22,27 +22,15 @@ #include "net/eathena/buysellhandler.h" -#include "actorspritemanager.h" -#include "configuration.h" -#include "inventory.h" #include "notifications.h" #include "notifymanager.h" -#include "being/localplayer.h" #include "being/playerinfo.h" #include "gui/buydialog.h" -#include "gui/buyselldialog.h" -#include "gui/selldialog.h" -#include "gui/shopwindow.h" - -#include "gui/widgets/chattab.h" - -#include "net/chathandler.h" #include "net/ea/eaprotocol.h" -#include "net/eathena/chathandler.h" #include "net/eathena/protocol.h" #include "debug.h" diff --git a/src/net/eathena/buysellhandler.h b/src/net/eathena/buysellhandler.h index ca3abfd09..fb584fb6a 100644 --- a/src/net/eathena/buysellhandler.h +++ b/src/net/eathena/buysellhandler.h @@ -23,8 +23,6 @@ #ifndef NET_EATHENA_BUYSELLHANDLER_H #define NET_EATHENA_BUYSELLHANDLER_H -#include "net/buysellhandler.h" - #include "net/ea/buysellhandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 8c580ce3a..72b416319 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -25,16 +25,14 @@ #include "client.h" #include "configuration.h" -#include "gui/charcreatedialog.h" - #include "net/logindata.h" +#include "net/net.h" -#include "net/eathena/gamehandler.h" #include "net/eathena/loginhandler.h" +#include "net/eathena/messageout.h" #include "net/eathena/network.h" #include "net/eathena/protocol.h" -#include "resources/colordb.h" #include "resources/itemdb.h" #include "resources/iteminfo.h" diff --git a/src/net/eathena/charserverhandler.h b/src/net/eathena/charserverhandler.h index 215e14235..49d384a93 100644 --- a/src/net/eathena/charserverhandler.h +++ b/src/net/eathena/charserverhandler.h @@ -23,16 +23,10 @@ #ifndef NET_EATHENA_CHARSERVERHANDLER_H #define NET_EATHENA_CHARSERVERHANDLER_H -#include "net/charserverhandler.h" - #include "net/ea/charserverhandler.h" #include "net/eathena/messagehandler.h" -#include "net/ea/token.h" - -class LoginData; - namespace EAthena { diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp index ebcc900de..b0425e7b8 100644 --- a/src/net/eathena/chathandler.cpp +++ b/src/net/eathena/chathandler.cpp @@ -22,15 +22,7 @@ #include "net/eathena/chathandler.h" -#include "actorspritemanager.h" -#include "configuration.h" -#include "game.h" - #include "being/localplayer.h" -#include "being/playerrelations.h" - -#include "gui/chatwindow.h" -#include "gui/shopwindow.h" #include "gui/widgets/chattab.h" diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h index e918fecc5..d97ca9d8d 100644 --- a/src/net/eathena/chathandler.h +++ b/src/net/eathena/chathandler.h @@ -23,12 +23,10 @@ #ifndef NET_EATHENA_CHATHANDLER_H #define NET_EATHENA_CHATHANDLER_H -#include "net/chathandler.h" -#include "net/net.h" - #include "net/ea/chathandler.h" #include "net/eathena/messagehandler.h" +#include "net/eathena/messageout.h" namespace EAthena { diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp index 9f501a4e0..f94bebde4 100644 --- a/src/net/eathena/gamehandler.cpp +++ b/src/net/eathena/gamehandler.cpp @@ -23,11 +23,13 @@ #include "net/eathena/gamehandler.h" #include "client.h" -#include "game.h" #include "being/localplayer.h" +#include "net/net.h" + #include "net/eathena/loginhandler.h" +#include "net/eathena/messageout.h" #include "net/eathena/network.h" #include "net/eathena/protocol.h" diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h index 49a21baf4..2c80496f3 100644 --- a/src/net/eathena/gamehandler.h +++ b/src/net/eathena/gamehandler.h @@ -23,9 +23,6 @@ #ifndef NET_EATHENA_GAMEHANDLER_H #define NET_EATHENA_GAMEHANDLER_H -#include "net/gamehandler.h" -#include "net/net.h" - #include "net/eathena/messagehandler.h" #include "net/ea/gamehandler.h" diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 55b3b644f..4f1edd971 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -26,9 +26,7 @@ #include "configuration.h" #include "logger.h" -#include "gui/charselectdialog.h" #include "gui/inventorywindow.h" -#include "gui/registerdialog.h" #include "gui/skilldialog.h" #include "gui/socialwindow.h" #include "gui/statuswindow.h" @@ -55,13 +53,8 @@ #include "net/eathena/tradehandler.h" #include "net/eathena/skillhandler.h" -#include "net/eathena/gui/guildtab.h" -#include "net/eathena/gui/partytab.h" - #include "utils/gettext.h" -#include - #include "debug.h" extern Net::GeneralHandler *generalHandler; diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h index 3f817ab3a..0af154695 100644 --- a/src/net/eathena/generalhandler.h +++ b/src/net/eathena/generalhandler.h @@ -24,7 +24,6 @@ #define NET_EATHENA_GENERALHANDLER_H #include "net/generalhandler.h" -#include "net/net.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/gui/guildtab.cpp b/src/net/eathena/gui/guildtab.cpp index 542a9327b..01a10bd8a 100644 --- a/src/net/eathena/gui/guildtab.cpp +++ b/src/net/eathena/gui/guildtab.cpp @@ -22,19 +22,6 @@ #include "net/eathena/gui/guildtab.h" -#include "chatlogger.h" -#include "guild.h" - -#include "being/localplayer.h" - -#include "net/net.h" -#include "net/guildhandler.h" - -#include "resources/iteminfo.h" -#include "resources/itemdb.h" - -#include "utils/gettext.h" - #include "debug.h" namespace EAthena diff --git a/src/net/eathena/gui/partytab.cpp b/src/net/eathena/gui/partytab.cpp index 420e19fea..8b43b28aa 100644 --- a/src/net/eathena/gui/partytab.cpp +++ b/src/net/eathena/gui/partytab.cpp @@ -22,21 +22,6 @@ #include "net/eathena/gui/partytab.h" -#include "chatlogger.h" -#include "party.h" - -#include "being/localplayer.h" - -#include "net/net.h" -#include "net/partyhandler.h" - -#include "resources/iteminfo.h" -#include "resources/itemdb.h" - -#include "utils/gettext.h" - -#include "net/chathandler.h" - #include "debug.h" namespace EAthena diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp index 22d6bc360..63b5aaea2 100644 --- a/src/net/eathena/guildhandler.cpp +++ b/src/net/eathena/guildhandler.cpp @@ -26,7 +26,7 @@ #include "being/localplayer.h" #include "being/playerinfo.h" -#include "net/eathena/messagein.h" +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" #include "debug.h" diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h index 4f3c3fa14..f0f6a6504 100644 --- a/src/net/eathena/guildhandler.h +++ b/src/net/eathena/guildhandler.h @@ -22,8 +22,6 @@ #ifndef NET_EATHENA_GUILDHANDLER_H #define NET_EATHENA_GUILDHANDLER_H -#include "net/guildhandler.h" - #include "net/ea/guildhandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index 11eb7fcf0..2bf70e00a 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -22,6 +22,7 @@ #include "net/eathena/inventoryhandler.h" +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/eathena/inventoryhandler.h b/src/net/eathena/inventoryhandler.h index d33771fb1..85c8ae8ab 100644 --- a/src/net/eathena/inventoryhandler.h +++ b/src/net/eathena/inventoryhandler.h @@ -23,10 +23,6 @@ #ifndef NET_EATHENA_INVENTORYHANDLER_H #define NET_EATHENA_INVENTORYHANDLER_H -#include "logger.h" - -#include "net/net.h" - #include "net/ea/inventoryhandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp index 1ecfc2a51..a19a859ec 100644 --- a/src/net/eathena/loginhandler.cpp +++ b/src/net/eathena/loginhandler.cpp @@ -23,13 +23,12 @@ #include "net/eathena/loginhandler.h" #include "client.h" -#include "configuration.h" #include "logger.h" +#include "net/eathena/messageout.h" #include "net/eathena/network.h" #include "net/eathena/protocol.h" -#include "utils/gettext.h" #include "utils/paths.h" #include "debug.h" diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h index 506b5b0a0..7c9b5eb61 100644 --- a/src/net/eathena/loginhandler.h +++ b/src/net/eathena/loginhandler.h @@ -31,8 +31,6 @@ #include -class LoginData; - namespace EAthena { diff --git a/src/net/eathena/messagehandler.h b/src/net/eathena/messagehandler.h index aafac96ea..bc67f3246 100644 --- a/src/net/eathena/messagehandler.h +++ b/src/net/eathena/messagehandler.h @@ -25,10 +25,6 @@ #include "net/messagehandler.h" -#include "net/eathena/messageout.h" - -#include - #include namespace EAthena diff --git a/src/net/eathena/messagein.cpp b/src/net/eathena/messagein.cpp index 1acbd4665..221a782bb 100644 --- a/src/net/eathena/messagein.cpp +++ b/src/net/eathena/messagein.cpp @@ -28,7 +28,6 @@ #include "utils/stringutils.h" -#include #include #include "debug.h" diff --git a/src/net/eathena/messagein.h b/src/net/eathena/messagein.h index 49f8a36f1..a73e4c93b 100644 --- a/src/net/eathena/messagein.h +++ b/src/net/eathena/messagein.h @@ -25,9 +25,6 @@ #include "net/messagein.h" -#include -#include - #include "localconsts.h" namespace EAthena diff --git a/src/net/eathena/messageout.cpp b/src/net/eathena/messageout.cpp index 6dc2e00f4..1ca2311ff 100644 --- a/src/net/eathena/messageout.cpp +++ b/src/net/eathena/messageout.cpp @@ -28,7 +28,6 @@ #include "logger.h" -#include #include #include diff --git a/src/net/eathena/messageout.h b/src/net/eathena/messageout.h index 0e8364131..d41d48e49 100644 --- a/src/net/eathena/messageout.h +++ b/src/net/eathena/messageout.h @@ -25,9 +25,6 @@ #include "net/messageout.h" -#include -#include - #include "localconsts.h" namespace EAthena diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp index 198c61bd4..24c3a70fa 100644 --- a/src/net/eathena/network.cpp +++ b/src/net/eathena/network.cpp @@ -22,16 +22,11 @@ #include "net/eathena/network.h" -#include "configuration.h" #include "logger.h" +#include "net/eathena/messagein.h" #include "net/eathena/protocol.h" -#include "utils/gettext.h" - -#include -#include - #include "debug.h" namespace EAthena diff --git a/src/net/eathena/network.h b/src/net/eathena/network.h index ea7a5506d..041c9889a 100644 --- a/src/net/eathena/network.h +++ b/src/net/eathena/network.h @@ -26,7 +26,6 @@ #include "net/ea/network.h" #include "net/eathena/messagehandler.h" -#include "net/eathena/messagein.h" /** * Protocol version, reported to the eAthena char and mapserver who can adjust diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp index ea480103e..b0066b561 100644 --- a/src/net/eathena/npchandler.cpp +++ b/src/net/eathena/npchandler.cpp @@ -25,14 +25,12 @@ #include "being/localplayer.h" #include "gui/npcdialog.h" -#include "gui/viewport.h" +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" #include "net/ea/eaprotocol.h" -#include "utils/langs.h" - #include "debug.h" extern Net::NpcHandler *npcHandler; diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h index e48c0e8ab..a993982bc 100644 --- a/src/net/eathena/npchandler.h +++ b/src/net/eathena/npchandler.h @@ -23,17 +23,10 @@ #ifndef NET_EATHENA_NPCHANDLER_H #define NET_EATHENA_NPCHANDLER_H -#include "net/net.h" -#include "net/npchandler.h" - #include "net/ea/npchandler.h" #include "net/eathena/messagehandler.h" -#include - -class NpcDialog; - namespace EAthena { diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp index 27b228a7b..2508c8556 100644 --- a/src/net/eathena/partyhandler.cpp +++ b/src/net/eathena/partyhandler.cpp @@ -27,10 +27,9 @@ #include "being/localplayer.h" +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "net/eathena/gui/partytab.h" - #include "debug.h" extern Net::PartyHandler *partyHandler; diff --git a/src/net/eathena/partyhandler.h b/src/net/eathena/partyhandler.h index 3a75fefd3..e52f763ec 100644 --- a/src/net/eathena/partyhandler.h +++ b/src/net/eathena/partyhandler.h @@ -22,7 +22,6 @@ #ifndef NET_EATHENA_PARTYHANDLER_H #define NET_EATHENA_PARTYHANDLER_H -#include "net/net.h" #include "net/partyhandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index 00234bd7c..aac729040 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -22,15 +22,12 @@ #include "net/eathena/playerhandler.h" -#include "configuration.h" -#include "client.h" +#include "net/net.h" +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "net/eathena/npchandler.h" #include "net/eathena/inventoryhandler.h" -#include "gui/whoisonline.h" - #include "debug.h" extern Net::PlayerHandler *playerHandler; diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h index 4e82d7067..2de4c148e 100644 --- a/src/net/eathena/playerhandler.h +++ b/src/net/eathena/playerhandler.h @@ -23,9 +23,6 @@ #ifndef NET_EATHENA_PLAYERHANDLER_H #define NET_EATHENA_PLAYERHANDLER_H -#include "net/net.h" -#include "net/playerhandler.h" - #include "net/ea/playerhandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/skillhandler.cpp b/src/net/eathena/skillhandler.cpp index e14d89e4e..0d654bbc8 100644 --- a/src/net/eathena/skillhandler.cpp +++ b/src/net/eathena/skillhandler.cpp @@ -22,8 +22,7 @@ #include "net/eathena/skillhandler.h" -#include "logger.h" - +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" #include "debug.h" diff --git a/src/net/eathena/skillhandler.h b/src/net/eathena/skillhandler.h index 2680d2c56..c404527c8 100644 --- a/src/net/eathena/skillhandler.h +++ b/src/net/eathena/skillhandler.h @@ -23,9 +23,6 @@ #ifndef NET_EATHENA_SKILLHANDLER_H #define NET_EATHENA_SKILLHANDLER_H -#include "net/net.h" -#include "net/skillhandler.h" - #include "net/ea/skillhandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp index 3698153da..f495e618f 100644 --- a/src/net/eathena/tradehandler.cpp +++ b/src/net/eathena/tradehandler.cpp @@ -26,6 +26,7 @@ #include "being/playerinfo.h" +#include "net/eathena/messageout.h" #include "net/eathena/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/eathena/tradehandler.h b/src/net/eathena/tradehandler.h index 22a8401c9..58e7b97f6 100644 --- a/src/net/eathena/tradehandler.h +++ b/src/net/eathena/tradehandler.h @@ -23,9 +23,6 @@ #ifndef NET_EATHENA_TRADEHANDLER_H #define NET_EATHENA_TRADEHANDLER_H -#include "net/net.h" -#include "net/tradehandler.h" - #include "net/ea/tradehandler.h" #include "net/eathena/messagehandler.h" diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index cca7eee01..2bc054e8b 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -24,8 +24,9 @@ #include "net/packetcounters.h" +#include "utils/stringutils.h" + #include "logger.h" -#include "net.h" #include "debug.h" diff --git a/src/net/messagein.h b/src/net/messagein.h index 3ed723360..0197effec 100644 --- a/src/net/messagein.h +++ b/src/net/messagein.h @@ -23,8 +23,6 @@ #ifndef NET_MESSAGEIN_H #define NET_MESSAGEIN_H -#include - #include #include "localconsts.h" diff --git a/src/net/messageout.h b/src/net/messageout.h index f4b32191b..1d1b51b55 100644 --- a/src/net/messageout.h +++ b/src/net/messageout.h @@ -23,9 +23,6 @@ #ifndef NET_MESSAGEOUT_H #define NET_MESSAGEOUT_H -#include - -#include #include #include "localconsts.h" diff --git a/src/net/net.cpp b/src/net/net.cpp index f22a87695..964c0e76d 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -24,21 +24,7 @@ #include "main.h" -#include "net/adminhandler.h" -#include "net/beinghandler.h" -#include "net/buysellhandler.h" -#include "net/charserverhandler.h" -#include "net/chathandler.h" -#include "net/generalhandler.h" -#include "net/guildhandler.h" -#include "net/inventoryhandler.h" #include "net/loginhandler.h" -#include "net/gamehandler.h" -#include "net/npchandler.h" -#include "net/partyhandler.h" -#include "net/playerhandler.h" -#include "net/skillhandler.h" -#include "net/tradehandler.h" #include "net/tmwa/generalhandler.h" diff --git a/src/net/sdltcpnet.h b/src/net/sdltcpnet.h index e8772b4bd..4f0a3df28 100644 --- a/src/net/sdltcpnet.h +++ b/src/net/sdltcpnet.h @@ -23,8 +23,6 @@ #include -#include - #include "localconsts.h" namespace TcpNet diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index c43f608eb..99d0f8935 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -22,15 +22,10 @@ #include "net/tmwa/adminhandler.h" -#include "actorspritemanager.h" -#include "game.h" #include "notifications.h" #include "notifymanager.h" -#include "being/playerrelations.h" - -#include "net/chathandler.h" - +#include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" #include diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h index 18185225f..1f339e485 100644 --- a/src/net/tmwa/adminhandler.h +++ b/src/net/tmwa/adminhandler.h @@ -23,9 +23,6 @@ #ifndef NET_TMWA_ADMINHANDLER_H #define NET_TMWA_ADMINHANDLER_H -#include "net/adminhandler.h" -#include "net/net.h" - #include "net/ea/adminhandler.h" #include "net/tmwa/messagehandler.h" diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index 13504cde3..c4ff7014f 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -24,35 +24,19 @@ #include "actorspritemanager.h" #include "client.h" -#include "configuration.h" -#include "effectmanager.h" #include "guild.h" #include "guildmanager.h" #include "party.h" #include "position.h" #include "being/localplayer.h" -#include "being/playerrelations.h" - -#include "input/keyboardconfig.h" - -#include "gui/botcheckerwindow.h" -#include "gui/outfitwindow.h" -#include "gui/socialwindow.h" -#include "gui/killstats.h" - -#include "utils/gettext.h" - -#include "net/playerhandler.h" +#include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" -#include "resources/colordb.h" #include "resources/itemdb.h" #include "resources/iteminfo.h" -#include - #include "debug.h" extern Net::BeingHandler *beingHandler; diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h index eea967168..1e8455d6a 100644 --- a/src/net/tmwa/beinghandler.h +++ b/src/net/tmwa/beinghandler.h @@ -23,9 +23,6 @@ #ifndef NET_TMWA_BEINGHANDLER_H #define NET_TMWA_BEINGHANDLER_H -#include "net/beinghandler.h" -#include "net/net.h" - #include "net/ea/beinghandler.h" #include "net/tmwa/messagehandler.h" diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp index d0a7b67b7..08719e0b6 100644 --- a/src/net/tmwa/buysellhandler.cpp +++ b/src/net/tmwa/buysellhandler.cpp @@ -22,27 +22,15 @@ #include "net/tmwa/buysellhandler.h" -#include "actorspritemanager.h" -#include "configuration.h" -#include "inventory.h" #include "notifications.h" #include "notifymanager.h" -#include "being/localplayer.h" #include "being/playerinfo.h" #include "gui/buydialog.h" -#include "gui/buyselldialog.h" -#include "gui/selldialog.h" -#include "gui/shopwindow.h" - -#include "gui/widgets/chattab.h" - -#include "net/chathandler.h" #include "net/ea/eaprotocol.h" -#include "net/tmwa/chathandler.h" #include "net/tmwa/protocol.h" #include "debug.h" diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h index 8571e9d8a..388830165 100644 --- a/src/net/tmwa/buysellhandler.h +++ b/src/net/tmwa/buysellhandler.h @@ -23,8 +23,6 @@ #ifndef NET_TMWA_BUYSELLHANDLER_H #define NET_TMWA_BUYSELLHANDLER_H -#include "net/buysellhandler.h" - #include "net/ea/buysellhandler.h" #include "net/tmwa/messagehandler.h" diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 6e58f5ee7..584ec0c38 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -25,16 +25,14 @@ #include "client.h" #include "configuration.h" -#include "gui/charcreatedialog.h" - #include "net/logindata.h" +#include "net/net.h" -#include "net/tmwa/gamehandler.h" #include "net/tmwa/loginhandler.h" +#include "net/tmwa/messageout.h" #include "net/tmwa/network.h" #include "net/tmwa/protocol.h" -#include "resources/colordb.h" #include "resources/itemdb.h" #include "resources/iteminfo.h" diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h index 412c77385..602a2f079 100644 --- a/src/net/tmwa/charserverhandler.h +++ b/src/net/tmwa/charserverhandler.h @@ -23,16 +23,10 @@ #ifndef NET_TMWA_CHARSERVERHANDLER_H #define NET_TMWA_CHARSERVERHANDLER_H -#include "net/charserverhandler.h" - #include "net/ea/charserverhandler.h" #include "net/tmwa/messagehandler.h" -#include "net/ea/token.h" - -class LoginData; - namespace TmwAthena { diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 7a01736e2..7ff5ed0f0 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -22,15 +22,7 @@ #include "net/tmwa/chathandler.h" -#include "actorspritemanager.h" -#include "configuration.h" -#include "game.h" - #include "being/localplayer.h" -#include "being/playerrelations.h" - -#include "gui/chatwindow.h" -#include "gui/shopwindow.h" #include "gui/widgets/chattab.h" diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h index 4a0429416..6da3a8eef 100644 --- a/src/net/tmwa/chathandler.h +++ b/src/net/tmwa/chathandler.h @@ -23,12 +23,10 @@ #ifndef NET_TMWA_CHATHANDLER_H #define NET_TMWA_CHATHANDLER_H -#include "net/chathandler.h" -#include "net/net.h" - #include "net/ea/chathandler.h" #include "net/tmwa/messagehandler.h" +#include "net/tmwa/messageout.h" namespace TmwAthena { diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp index 57771559d..a8d72897d 100644 --- a/src/net/tmwa/gamehandler.cpp +++ b/src/net/tmwa/gamehandler.cpp @@ -23,11 +23,13 @@ #include "net/tmwa/gamehandler.h" #include "client.h" -#include "game.h" #include "being/localplayer.h" +#include "net/net.h" + #include "net/tmwa/loginhandler.h" +#include "net/tmwa/messageout.h" #include "net/tmwa/network.h" #include "net/tmwa/protocol.h" diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h index 755bd69dc..b38db877c 100644 --- a/src/net/tmwa/gamehandler.h +++ b/src/net/tmwa/gamehandler.h @@ -23,9 +23,6 @@ #ifndef NET_TMWA_GAMEHANDLER_H #define NET_TMWA_GAMEHANDLER_H -#include "net/gamehandler.h" -#include "net/net.h" - #include "net/tmwa/messagehandler.h" #include "net/ea/gamehandler.h" diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 1d92e1eb8..cb01e6509 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -26,9 +26,7 @@ #include "configuration.h" #include "logger.h" -#include "gui/charselectdialog.h" #include "gui/inventorywindow.h" -#include "gui/registerdialog.h" #include "gui/skilldialog.h" #include "gui/socialwindow.h" #include "gui/statuswindow.h" @@ -56,13 +54,8 @@ #include "net/tmwa/skillhandler.h" #include "net/tmwa/questhandler.h" -#include "net/tmwa/gui/guildtab.h" -#include "net/tmwa/gui/partytab.h" - #include "utils/gettext.h" -#include - #include "debug.h" extern Net::GeneralHandler *generalHandler; diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index 0b471e93f..47ca0081a 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -24,7 +24,6 @@ #define NET_TMWA_GENERALHANDLER_H #include "net/generalhandler.h" -#include "net/net.h" #include "net/tmwa/messagehandler.h" diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp index cc907295f..dcfa97d21 100644 --- a/src/net/tmwa/gui/guildtab.cpp +++ b/src/net/tmwa/gui/guildtab.cpp @@ -22,19 +22,6 @@ #include "net/tmwa/gui/guildtab.h" -#include "chatlogger.h" -#include "guild.h" - -#include "being/localplayer.h" - -#include "net/net.h" -#include "net/guildhandler.h" - -#include "resources/iteminfo.h" -#include "resources/itemdb.h" - -#include "utils/gettext.h" - #include "debug.h" namespace TmwAthena diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp index e0c28ab4a..b26d84f8f 100644 --- a/src/net/tmwa/gui/partytab.cpp +++ b/src/net/tmwa/gui/partytab.cpp @@ -22,21 +22,6 @@ #include "net/tmwa/gui/partytab.h" -#include "chatlogger.h" -#include "party.h" - -#include "being/localplayer.h" - -#include "net/net.h" -#include "net/partyhandler.h" - -#include "resources/iteminfo.h" -#include "resources/itemdb.h" - -#include "utils/gettext.h" - -#include "net/chathandler.h" - #include "debug.h" namespace TmwAthena diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index 65b984dbd..862c437ed 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -26,7 +26,7 @@ #include "being/localplayer.h" #include "being/playerinfo.h" -#include "net/tmwa/messagein.h" +#include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" #include "debug.h" diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h index 2a0c8d7db..d2238ff83 100644 --- a/src/net/tmwa/guildhandler.h +++ b/src/net/tmwa/guildhandler.h @@ -22,8 +22,6 @@ #ifndef NET_TMWA_GUILDHANDLER_H #define NET_TMWA_GUILDHANDLER_H -#include "net/guildhandler.h" - #include "net/ea/guildhandler.h" #include "net/tmwa/messagehandler.h" diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index d1cfc7136..a993bb35c 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -22,6 +22,7 @@ #include "net/tmwa/inventoryhandler.h" +#include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index a02be49ee..9d7e877cf 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -23,10 +23,6 @@ #ifndef NET_TMWA_INVENTORYHANDLER_H #define NET_TMWA_INVENTORYHANDLER_H -#include "logger.h" - -#include "net/net.h" - #include "net/ea/inventoryhandler.h" #include "net/tmwa/messagehandler.h" diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index 91e2c3027..4fe225de6 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -23,13 +23,12 @@ #include "net/tmwa/loginhandler.h" #include "client.h" -#include "configuration.h" #include "logger.h" +#include "net/tmwa/messageout.h" #include "net/tmwa/network.h" #include "net/tmwa/protocol.h" -#include "utils/gettext.h" #include "utils/paths.h" #include "debug.h" diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h index d05d0a747..972bf353a 100644 --- a/src/net/tmwa/loginhandler.h +++ b/src/net/tmwa/loginhandler.h @@ -23,16 +23,12 @@ #ifndef NET_TMWA_LOGINHANDLER_H #define NET_TMWA_LOGINHANDLER_H -#include "net/loginhandler.h" - #include "net/ea/loginhandler.h" #include "net/tmwa/messagehandler.h" #include -class LoginData; - namespace TmwAthena { diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h index 5afe28bff..578926478 100644 --- a/src/net/tmwa/messagehandler.h +++ b/src/net/tmwa/messagehandler.h @@ -25,9 +25,7 @@ #include "net/messagehandler.h" -#include "net/tmwa/messageout.h" - -#include +//#include #include diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp index a9a2ce5a5..dac641414 100644 --- a/src/net/tmwa/messagein.cpp +++ b/src/net/tmwa/messagein.cpp @@ -28,7 +28,6 @@ #include "utils/stringutils.h" -#include #include #include "debug.h" diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h index 75e85b044..a17260177 100644 --- a/src/net/tmwa/messagein.h +++ b/src/net/tmwa/messagein.h @@ -25,9 +25,6 @@ #include "net/messagein.h" -#include -#include - #include "localconsts.h" namespace TmwAthena diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp index 2fc0ff2d9..7a96497ee 100644 --- a/src/net/tmwa/messageout.cpp +++ b/src/net/tmwa/messageout.cpp @@ -28,7 +28,6 @@ #include "logger.h" -#include #include #include diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h index 1d7b76800..a68e4788f 100644 --- a/src/net/tmwa/messageout.h +++ b/src/net/tmwa/messageout.h @@ -25,9 +25,6 @@ #include "net/messageout.h" -#include -#include - #include "localconsts.h" namespace TmwAthena diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index a77fbbf7c..73288d4d1 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -22,16 +22,11 @@ #include "net/tmwa/network.h" -#include "configuration.h" #include "logger.h" +#include "net/tmwa/messagein.h" #include "net/tmwa/protocol.h" -#include "utils/gettext.h" - -#include -#include - #include "debug.h" namespace TmwAthena diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h index 29b9de002..9d2e49183 100644 --- a/src/net/tmwa/network.h +++ b/src/net/tmwa/network.h @@ -26,7 +26,6 @@ #include "net/ea/network.h" #include "net/tmwa/messagehandler.h" -#include "net/tmwa/messagein.h" /** * Protocol version, reported to the eAthena char and mapserver who can adjust diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index 2f4fc2e70..026727a6e 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -27,6 +27,7 @@ #include "gui/npcdialog.h" #include "gui/viewport.h" +#include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index 8b5adfcac..52d77b769 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -23,17 +23,10 @@ #ifndef NET_TMWA_NPCHANDLER_H #define NET_TMWA_NPCHANDLER_H -#include "net/net.h" -#include "net/npchandler.h" - #include "net/ea/npchandler.h" #include "net/tmwa/messagehandler.h" -#include - -class NpcDialog; - namespace TmwAthena { diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp index 2124679e9..92c79d447 100644 --- a/src/net/tmwa/partyhandler.cpp +++ b/src/net/tmwa/partyhandler.cpp @@ -27,10 +27,9 @@ #include "being/localplayer.h" +#include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" -#include "net/tmwa/gui/partytab.h" - #include "debug.h" extern Net::PartyHandler *partyHandler; diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h index 892dfd70d..d403b557a 100644 --- a/src/net/tmwa/partyhandler.h +++ b/src/net/tmwa/partyhandler.h @@ -22,7 +22,6 @@ #ifndef NET_TMWA_PARTYHANDLER_H #define NET_TMWA_PARTYHANDLER_H -#include "net/net.h" #include "net/partyhandler.h" #include "net/tmwa/messagehandler.h" diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 645959fbc..dc6244f43 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -25,9 +25,11 @@ #include "configuration.h" #include "client.h" -#include "net/tmwa/protocol.h" -#include "net/tmwa/npchandler.h" +#include "net/net.h" + #include "net/tmwa/inventoryhandler.h" +#include "net/tmwa/messageout.h" +#include "net/tmwa/protocol.h" #include "gui/whoisonline.h" diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h index 94f993377..aa6cf1d94 100644 --- a/src/net/tmwa/playerhandler.h +++ b/src/net/tmwa/playerhandler.h @@ -23,9 +23,6 @@ #ifndef NET_TMWA_PLAYERHANDLER_H #define NET_TMWA_PLAYERHANDLER_H -#include "net/net.h" -#include "net/playerhandler.h" - #include "net/ea/playerhandler.h" #include "net/tmwa/messagehandler.h" diff --git a/src/net/tmwa/questhandler.cpp b/src/net/tmwa/questhandler.cpp index 9a5f52330..4df7f06ce 100644 --- a/src/net/tmwa/questhandler.cpp +++ b/src/net/tmwa/questhandler.cpp @@ -20,17 +20,11 @@ #include "net/tmwa/questhandler.h" -#include "being/localplayer.h" - #include "gui/skilldialog.h" #include "gui/questswindow.h" #include "net/tmwa/protocol.h" -#include "net/ea/eaprotocol.h" - -#include "utils/langs.h" - #include "debug.h" namespace TmwAthena diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h index ef6e79c13..80d39e67b 100644 --- a/src/net/tmwa/questhandler.h +++ b/src/net/tmwa/questhandler.h @@ -21,15 +21,8 @@ #ifndef NET_TMWA_QUESTHANDLER_H #define NET_TMWA_QUESTHANDLER_H -#include "net/net.h" -#include "net/npchandler.h" - -#include "net/ea/npchandler.h" - #include "net/tmwa/messagehandler.h" -#include - namespace TmwAthena { diff --git a/src/net/tmwa/skillhandler.cpp b/src/net/tmwa/skillhandler.cpp index 75edaf63b..5edb1c0b4 100644 --- a/src/net/tmwa/skillhandler.cpp +++ b/src/net/tmwa/skillhandler.cpp @@ -22,8 +22,7 @@ #include "net/tmwa/skillhandler.h" -#include "logger.h" - +#include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" #include "debug.h" diff --git a/src/net/tmwa/skillhandler.h b/src/net/tmwa/skillhandler.h index d472faaff..129331ff3 100644 --- a/src/net/tmwa/skillhandler.h +++ b/src/net/tmwa/skillhandler.h @@ -23,9 +23,6 @@ #ifndef NET_TMWA_SKILLHANDLER_H #define NET_TMWA_SKILLHANDLER_H -#include "net/net.h" -#include "net/skillhandler.h" - #include "net/ea/skillhandler.h" #include "net/tmwa/messagehandler.h" diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 3d49a63d0..6b144cd5a 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -26,6 +26,7 @@ #include "being/playerinfo.h" +#include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h index 707384d85..9e6137f87 100644 --- a/src/net/tmwa/tradehandler.h +++ b/src/net/tmwa/tradehandler.h @@ -23,9 +23,6 @@ #ifndef NET_TMWA_TRADEHANDLER_H #define NET_TMWA_TRADEHANDLER_H -#include "net/net.h" -#include "net/tradehandler.h" - #include "net/ea/tradehandler.h" #include "net/tmwa/messagehandler.h" -- cgit v1.2.3-70-g09d2