From 23034a47937c109590eb60e4ee0efa32a8c9e45e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 15 Mar 2015 22:03:17 +0300 Subject: Remove useless includes from cpp files --- src/actions/actions.cpp | 9 ++++----- src/actions/chat.cpp | 6 ++---- src/actions/pets.cpp | 6 ++++++ src/actions/windows.cpp | 7 ++++++- 4 files changed, 18 insertions(+), 10 deletions(-) (limited to 'src/actions') diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index 7d8e18591..516fa8a36 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -25,15 +25,15 @@ #include "dropshortcut.h" #include "emoteshortcut.h" #include "game.h" +#ifdef USE_OPENGL #include "graphicsmanager.h" -#include "inventory.h" +#endif #include "itemshortcut.h" #include "spellmanager.h" #include "actions/actiondef.h" #include "being/localplayer.h" -#include "being/playerinfo.h" #include "enums/being/attributes.h" @@ -64,14 +64,15 @@ #include "gui/widgets/tabs/chat/chattab.h" -#include "render/graphics.h" #if defined USE_OPENGL #include "render/normalopenglgraphics.h" #endif #include "net/adminhandler.h" #include "net/beinghandler.h" +#ifdef EATHENA_SUPPORT #include "net/buyingstorehandler.h" +#endif #include "net/buysellhandler.h" #include "net/chathandler.h" #include "net/download.h" @@ -92,8 +93,6 @@ #include "resources/resourcemanager.h" #include "resources/skillconsts.h" -#include "resources/db/itemdb.h" - #include "utils/chatutils.h" #include "utils/delete2.h" #include "utils/gettext.h" diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp index 2ac6ec0f1..3f54d0dc4 100644 --- a/src/actions/chat.cpp +++ b/src/actions/chat.cpp @@ -21,7 +21,9 @@ #include "actions/chat.h" #include "configuration.h" +#ifdef TMWA_SUPPORT #include "guildmanager.h" +#endif #include "actions/actiondef.h" @@ -31,9 +33,6 @@ #include "gui/windows/chatwindow.h" -#include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chat/chattabtype.h" - #include "net/chathandler.h" #include "net/guildhandler.h" #include "net/partyhandler.h" @@ -41,7 +40,6 @@ #include "utils/booleanoptions.h" #include "utils/chatutils.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/actions/pets.cpp b/src/actions/pets.cpp index 7e046758c..8f6d8833c 100644 --- a/src/actions/pets.cpp +++ b/src/actions/pets.cpp @@ -34,7 +34,9 @@ #include "listeners/inputactionreplaylistener.h" #include "net/chathandler.h" +#ifdef TMWA_SUPPORT #include "net/net.h" +#endif #include "net/pethandler.h" #include "net/serverfeatures.h" @@ -61,10 +63,14 @@ static const Being *getPet() return *pets.begin(); } #endif +#ifdef EATHENA_SUPPORT const int id = PlayerInfo::getPetBeingId(); if (!id) return nullptr; return actorManager->findBeing(id); +#else + return nullptr; +#endif } impHandler(commandEmotePet) diff --git a/src/actions/windows.cpp b/src/actions/windows.cpp index eccc21d1d..6b359ff8d 100644 --- a/src/actions/windows.cpp +++ b/src/actions/windows.cpp @@ -22,11 +22,15 @@ #include "actions/actiondef.h" +#ifdef EATHENA_SUPPORT #include "being/localplayer.h" +#endif #include "gui/dialogsmanager.h" +#ifdef EATHENA_SUPPORT #include "gui/windows/bankwindow.h" +#endif #include "gui/windows/skilldialog.h" #include "gui/windows/socialwindow.h" #include "gui/windows/statuswindow.h" @@ -48,9 +52,10 @@ #include "gui/windows/updaterwindow.h" #include "gui/widgets/tabs/chat/chattab.h" -#include "gui/widgets/tabs/chat/chattabtype.h" +#ifdef EATHENA_SUPPORT #include "net/serverfeatures.h" +#endif #include "debug.h" -- cgit v1.2.3-70-g09d2