diff options
Diffstat (limited to 'src/net')
29 files changed, 12 insertions, 59 deletions
diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h index 5207d677d..70e683769 100644 --- a/src/net/adminhandler.h +++ b/src/net/adminhandler.h @@ -23,11 +23,11 @@ #ifndef NET_ADMINHANDLER_H #define NET_ADMINHANDLER_H -#include "being/being.h" -#include <iosfwd> +#include "localconsts.h" + #include <string> -#include "localconsts.h" +class Being; namespace Net { diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h index 31077d851..d8c14a4de 100644 --- a/src/net/charserverhandler.h +++ b/src/net/charserverhandler.h @@ -25,9 +25,6 @@ #include "being/localplayer.h" -#include <string> -#include <vector> - class CharCreateDialog; class CharSelectDialog; diff --git a/src/net/chathandler.h b/src/net/chathandler.h index e0567f23c..dad30b676 100644 --- a/src/net/chathandler.h +++ b/src/net/chathandler.h @@ -23,8 +23,6 @@ #ifndef NET_CHATHANDLER_H #define NET_CHATHANDLER_H - -#include <iosfwd> #include <string> #include "localconsts.h" diff --git a/src/net/ea/equipbackend.h b/src/net/ea/equipbackend.h index 5aa56bf6b..c264724a8 100644 --- a/src/net/ea/equipbackend.h +++ b/src/net/ea/equipbackend.h @@ -23,8 +23,6 @@ #ifndef NET_EA_EQUIPBACKEND_H #define NET_EA_EQUIPBACKEND_H -#include "equipment.h" -#include "inventory.h" #include "item.h" #include "being/playerinfo.h" diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index 77cf40a56..26d74d56a 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -30,7 +30,6 @@ #include "net/ea/equipbackend.h" #include "net/ea/inventoryitem.h" -#include <vector> #include <queue> namespace Net diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp index f09dc57d5..a4c1a164b 100644 --- a/src/net/ea/itemhandler.cpp +++ b/src/net/ea/itemhandler.cpp @@ -24,6 +24,8 @@ #include "actormanager.h" +#include "net/messagein.h" + #include "debug.h" namespace Ea diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h index 37cd097ff..a67f701a4 100644 --- a/src/net/ea/itemhandler.h +++ b/src/net/ea/itemhandler.h @@ -23,8 +23,6 @@ #ifndef NET_EA_ITEMHANDLER_H #define NET_EA_ITEMHANDLER_H -#include "net/messagein.h" - #include "localconsts.h" namespace Net diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index c182d7065..8b8077cde 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -34,6 +34,7 @@ #include "utils/gettext.h" #include "utils/paths.h" +#include "net/logindata.h" #include "net/messagein.h" #include "debug.h" diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h index 111aa5965..b2d57574d 100644 --- a/src/net/ea/loginhandler.h +++ b/src/net/ea/loginhandler.h @@ -29,8 +29,6 @@ #include "net/ea/token.h" -#include <string> - class LoginData; namespace Net diff --git a/src/net/ea/network.h b/src/net/ea/network.h index 95bb6c456..52693ef30 100644 --- a/src/net/ea/network.h +++ b/src/net/ea/network.h @@ -26,10 +26,6 @@ #include "net/serverinfo.h" #include "net/sdltcpnet.h" -#include <SDL_thread.h> - -#include <string> - namespace Ea { diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index a2833eee3..eb6f8d0af 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -31,6 +31,7 @@ #include "being/beingflag.h" #include "being/localplayer.h" +#include "being/playerinfo.h" #include "enums/being/attributes.h" diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index 683654d61..5bdf42775 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -31,6 +31,7 @@ #include "net/messagein.h" #include "utils/gettext.h" +#include "utils/stringutils.h" #include "resources/notifytypes.h" diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp index 1e394d300..75250d2b7 100644 --- a/src/net/eathena/adminhandler.cpp +++ b/src/net/eathena/adminhandler.cpp @@ -24,6 +24,8 @@ #include "logger.h" +#include "being/being.h" + #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" diff --git a/src/net/eathena/loginhandler.h b/src/net/eathena/loginhandler.h index 38cacc380..918d5c66d 100644 --- a/src/net/eathena/loginhandler.h +++ b/src/net/eathena/loginhandler.h @@ -27,8 +27,6 @@ #include "net/eathena/messagehandler.h" -#include <string> - namespace EAthena { diff --git a/src/net/eathena/messagehandler.h b/src/net/eathena/messagehandler.h index 10bd228a6..1bf84f449 100644 --- a/src/net/eathena/messagehandler.h +++ b/src/net/eathena/messagehandler.h @@ -25,8 +25,6 @@ #include "net/messagehandler.h" -#include <memory> - namespace EAthena { diff --git a/src/net/gamehandler.h b/src/net/gamehandler.h index 2a4f23246..1b1e3b560 100644 --- a/src/net/gamehandler.h +++ b/src/net/gamehandler.h @@ -25,8 +25,6 @@ #include "net/logindata.h" -#include <iosfwd> - namespace Net { diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h index 5869eac80..bbc7554fd 100644 --- a/src/net/guildhandler.h +++ b/src/net/guildhandler.h @@ -27,8 +27,6 @@ #include "gui/widgets/tabs/chat/chattab.h" -#include <iosfwd> - class Being; namespace Net diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index d22bcd4e1..fc1365898 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -23,12 +23,8 @@ #ifndef NET_INVENTORYHANDLER_H #define NET_INVENTORYHANDLER_H -#include "item.h" - #include "inventory.h" -#include <iosfwd> - namespace Net { diff --git a/src/net/ipc.h b/src/net/ipc.h index aca398e52..463d5ea83 100644 --- a/src/net/ipc.h +++ b/src/net/ipc.h @@ -26,8 +26,6 @@ #include <string> #include <vector> -#include <SDL_thread.h> - class IPC final { public: diff --git a/src/net/logindata.h b/src/net/logindata.h index 514b8fd6e..ddd3685be 100644 --- a/src/net/logindata.h +++ b/src/net/logindata.h @@ -29,8 +29,6 @@ #include "utils/stringvector.h" -#include <string> - #include "localconsts.h" class LoginData final diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h index c75004a70..c7dee1fcc 100644 --- a/src/net/loginhandler.h +++ b/src/net/loginhandler.h @@ -23,12 +23,10 @@ #ifndef NET_LOGINHANDLER_H #define NET_LOGINHANDLER_H -#include "net/logindata.h" #include "net/serverinfo.h" #include "net/worldinfo.h" -#include <iosfwd> -#include <vector> +class LoginData; namespace Net { diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h index 347d27d04..0d13053c5 100644 --- a/src/net/messagehandler.h +++ b/src/net/messagehandler.h @@ -25,10 +25,6 @@ #include "net/messagein.h" -#include <SDL_types.h> - -#include <memory> - namespace Net { diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h index 4bd27d15b..2d148d247 100644 --- a/src/net/partyhandler.h +++ b/src/net/partyhandler.h @@ -29,8 +29,6 @@ #include "gui/widgets/tabs/chat/chattab.h" -#include <string> - class Being; namespace Net diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 020eda605..10eac7462 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -25,8 +25,7 @@ #include "flooritem.h" -#include "being/being.h" -#include "being/playerinfo.h" +#include "enums/being/beingaction.h" namespace Net { diff --git a/src/net/questhandler.h b/src/net/questhandler.h index fa64500f9..5ca3f563e 100644 --- a/src/net/questhandler.h +++ b/src/net/questhandler.h @@ -21,8 +21,6 @@ #ifndef NET_QUESTHANDLER_H #define NET_QUESTHANDLER_H -#include <string> - #include "localconsts.h" namespace Net diff --git a/src/net/serverinfo.h b/src/net/serverinfo.h index a1b0c5b41..a17e5b3b2 100644 --- a/src/net/serverinfo.h +++ b/src/net/serverinfo.h @@ -27,11 +27,6 @@ #include "utils/stringutils.h" -#include <SDL_stdinc.h> - -#include <string> -#include <vector> - #include "localconsts.h" class ServerInfo final diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h index 5a1b11707..fa27859c7 100644 --- a/src/net/tmwa/loginhandler.h +++ b/src/net/tmwa/loginhandler.h @@ -27,8 +27,6 @@ #include "net/tmwa/messagehandler.h" -#include <string> - namespace TmwAthena { diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h index 43b551692..047dd82ff 100644 --- a/src/net/tmwa/messagehandler.h +++ b/src/net/tmwa/messagehandler.h @@ -25,8 +25,6 @@ #include "net/messagehandler.h" -#include <memory> - namespace TmwAthena { diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h index 09074c139..78cfdf17f 100644 --- a/src/net/tradehandler.h +++ b/src/net/tradehandler.h @@ -25,8 +25,6 @@ #include "being/being.h" -#include <iosfwd> - #include "localconsts.h" class Item; |