diff options
Diffstat (limited to 'src/gui/windows')
26 files changed, 35 insertions, 87 deletions
diff --git a/src/gui/windows/botcheckerwindow.cpp b/src/gui/windows/botcheckerwindow.cpp index 8627b147f..a7fd4ea44 100644 --- a/src/gui/windows/botcheckerwindow.cpp +++ b/src/gui/windows/botcheckerwindow.cpp @@ -24,9 +24,7 @@ #include "gui/windows/setupwindow.h" -#include "gui/widgets/button.h" #include "gui/widgets/scrollarea.h" -#include "gui/widgets/label.h" #include "gui/widgets/guitable.h" #include "gui/models/userstablemodel.h" diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index ce6775637..b885cc8a6 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -26,7 +26,6 @@ #include "actormanager.h" #endif #include "configuration.h" -#include "shopitem.h" #include "units.h" #include "gui/windows/setupwindow.h" diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp index 550e3c941..822947c22 100644 --- a/src/gui/windows/changeemaildialog.cpp +++ b/src/gui/windows/changeemaildialog.cpp @@ -34,15 +34,11 @@ #include "listeners/wrongdatanoticelistener.h" -#include "net/logindata.h" #include "net/loginhandler.h" #include "utils/delete2.h" #include "utils/gettext.h" -#include <string> -#include <sstream> - #include "debug.h" ChangeEmailDialog::ChangeEmailDialog(LoginData *const data) : diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp index 9c2abef21..049f00a5e 100644 --- a/src/gui/windows/changepassworddialog.cpp +++ b/src/gui/windows/changepassworddialog.cpp @@ -35,15 +35,11 @@ #include "listeners/wrongdatanoticelistener.h" -#include "net/logindata.h" #include "net/loginhandler.h" #include "utils/delete2.h" #include "utils/gettext.h" -#include <string> -#include <sstream> - #include "debug.h" ChangePasswordDialog::ChangePasswordDialog(LoginData *const data) : diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 1452433d6..cb2caed4b 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -23,7 +23,6 @@ #include "gui/windows/charcreatedialog.h" #include "configuration.h" -#include "main.h" #include "input/inputaction.h" @@ -49,7 +48,6 @@ #include "utils/delete2.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index adfb46d63..85a23ed64 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -31,7 +31,9 @@ #include "input/inputaction.h" #include "listeners/charrenamelistener.h" +#ifdef EATHENA_SUPPORT #include "listeners/pincodelistener.h" +#endif #include "enums/gui/dialogtype.h" @@ -49,7 +51,6 @@ #include "gui/widgets/containerplacer.h" #include "net/character.h" -#include "net/logindata.h" #include "net/loginhandler.h" #include "net/registrationoptions.h" #include "net/serverfeatures.h" diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index b1c0f6982..748114b10 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -23,7 +23,6 @@ #include "gui/windows/chatwindow.h" #include "actormanager.h" -#include "configuration.h" #include "game.h" #include "guild.h" #include "party.h" @@ -48,7 +47,6 @@ #include "gui/popups/popupmenu.h" -#include "gui/windows/emotewindow.h" #include "gui/windows/setupwindow.h" #include "gui/windows/whoisonline.h" @@ -74,9 +72,6 @@ #include "utils/copynpaste.h" #include "utils/delete2.h" #include "utils/files.h" -#include "utils/gettext.h" - -#include <sstream> #include <sys/stat.h> diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index f26a877cf..0b5fe10f1 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -25,10 +25,7 @@ #include "configuration.h" #include "dragdrop.h" #include "graphicsvertexes.h" -#include "inventory.h" -#include "item.h" -#include "being/being.h" #include "being/localplayer.h" #include "being/playerinfo.h" diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index a47d2a931..bf3077c1d 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -23,7 +23,6 @@ #include "gui/windows/inventorywindow.h" #include "configuration.h" -#include "item.h" #include "units.h" #include "being/playerinfo.h" @@ -64,8 +63,6 @@ #include "utils/delete2.h" -#include <string> - #include "debug.h" InventoryWindow *inventoryWindow = nullptr; diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index 1369a0686..01289a4c3 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -22,8 +22,6 @@ #include "gui/windows/itemamountwindow.h" -#include "item.h" - #include "being/playerinfo.h" #include "input/keyboardconfig.h" diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 8fcb175ef..965f1d71c 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -37,7 +37,6 @@ #include "gui/windows/setupwindow.h" -#include "resources/image.h" #include "resources/imagehelper.h" #include "resources/resourcemanager.h" diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index ec2cf05b2..7051465c6 100644 --- a/src/gui/windows/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -27,7 +27,6 @@ #include "inventory.h" #include "being/localplayer.h" -#include "being/playerinfo.h" #include "enums/being/attributes.h" diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 096ab1c39..6207a9bd7 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -24,7 +24,6 @@ #include "actormanager.h" #include "configuration.h" -#include "inventory.h" #include "item.h" #include "settings.h" #include "soundconsts.h" diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index 3a0f26d64..59734edca 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -27,7 +27,6 @@ #include "emoteshortcutconsts.h" #include "game.h" #include "inventory.h" -#include "item.h" #include "being/playerinfo.h" @@ -45,12 +44,8 @@ #include "gui/widgets/layout.h" #include "gui/widgets/layouttype.h" -#include "resources/image.h" - #include "utils/gettext.h" -#include <vector> - #include "debug.h" OutfitWindow *outfitWindow = nullptr; diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index fdddfec6f..8d7d84480 100644 --- a/src/gui/windows/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -39,7 +39,6 @@ #include "gui/widgets/passwordfield.h" #include "gui/widgets/radiobutton.h" -#include "net/logindata.h" #include "net/loginhandler.h" #include "net/registrationoptions.h" #include "net/serverfeatures.h" diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 8afbf0e54..a5f8efb95 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -25,19 +25,12 @@ #include "chatlogger.h" #include "client.h" #include "configuration.h" -#include "main.h" #include "settings.h" #include "input/inputaction.h" #include "net/download.h" -#include "gui/gui.h" - -#include "gui/fonts/font.h" - -#include "gui/models/serverslistmodel.h" - #include "gui/widgets/checkbox.h" #include "gui/widgets/desktop.h" #include "gui/windows/editserverdialog.h" @@ -46,7 +39,6 @@ #include "gui/widgets/button.h" #include "gui/widgets/label.h" #include "gui/widgets/layout.h" -#include "gui/widgets/listbox.h" #include "gui/widgets/serverslistbox.h" #include "gui/widgets/scrollarea.h" @@ -54,8 +46,6 @@ #include "utils/gettext.h" #include "utils/langs.h" -#include <string> - #include "debug.h" static const int MAX_SERVERLIST = 15; diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp index 8e5c61e02..3f04d0e69 100644 --- a/src/gui/windows/setupwindow.cpp +++ b/src/gui/windows/setupwindow.cpp @@ -24,7 +24,6 @@ #include "configuration.h" #include "game.h" -#include "main.h" #include "touchmanager.h" #include "gui/windows/chatwindow.h" diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 4cb922519..9a4fd7729 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -22,16 +22,24 @@ #include "gui/windows/shopwindow.h" -#include "gui/chatconsts.h" +#include "enums/being/attributes.h" +#ifdef TMWA_SUPPORT #include "gui/windows/buydialog.h" #include "gui/windows/chatwindow.h" #include "gui/windows/confirmdialog.h" +#include "gui/windows/shopselldialog.h" +#include "gui/windows/tradewindow.h" + +#include "gui/chatconsts.h" +#endif + +#ifdef EATHENA_SUPPORT #include "gui/windows/editdialog.h" +#endif + #include "gui/windows/itemamountwindow.h" -#include "gui/windows/shopselldialog.h" #include "gui/windows/setupwindow.h" -#include "gui/windows/tradewindow.h" #include "gui/models/shopitems.h" @@ -44,34 +52,41 @@ #include "gui/widgets/shoplistbox.h" #include "gui/widgets/tabstrip.h" +#ifdef EATHENA_SUPPORT #include "listeners/shoprenamelistener.h" +#endif +#ifdef TMWA_SUPPORT #include "actormanager.h" +#include "soundmanager.h" +#endif #include "configuration.h" #include "inventory.h" -#include "item.h" #include "settings.h" #include "shopitem.h" -#include "soundmanager.h" #include "being/localplayer.h" #include "being/playerinfo.h" -#include "being/playerrelations.h" - -#include "enums/being/attributes.h" +#ifdef TMWA_SUPPORT +#include "being/playerrelations.h" #include "net/chathandler.h" +#endif +#ifdef EATHENA_SUPPORT #include "net/buyingstorehandler.h" +#include "net/vendinghandler.h" +#endif #include "net/serverfeatures.h" +#ifdef TMWA_SUPPORT #include "net/tradehandler.h" -#include "net/vendinghandler.h" - -#include "resources/iteminfo.h" +#endif #include "utils/delete2.h" #include "utils/gettext.h" -#include <sstream> +#ifdef TMWA_SUPPORT +#include "resources/iteminfo.h" +#endif #include <sys/stat.h> diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 681ed348f..48ab6bba4 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -31,13 +31,10 @@ #include "enums/being/attributes.h" -#include "gui/models/skillmodel.h" - #include "gui/windows/setupwindow.h" #include "gui/windows/shortcutwindow.h" #include "gui/widgets/button.h" -#include "gui/widgets/skilllistbox.h" #include "gui/widgets/label.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/tabbedarea.h" @@ -52,7 +49,6 @@ #include "utils/timer.h" #include "resources/beingcommon.h" -#include "resources/skillconsts.h" #include "debug.h" diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index b359bc775..ad1745287 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -21,23 +21,17 @@ #include "gui/windows/socialwindow.h" -#include "configuration.h" -#include "guild.h" +#ifdef TMWA_SUPPORT #include "guildmanager.h" - -#include "being/localplayer.h" -#include "being/playerrelations.h" +#endif #include "enums/gui/dialogtype.h" -#include "gui/windows/confirmdialog.h" #include "gui/windows/okdialog.h" #include "gui/windows/setupwindow.h" -#include "gui/windows/textdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/label.h" -#include "gui/widgets/scrollarea.h" #include "gui/widgets/tabbedarea.h" #include "gui/widgets/tabs/socialattacktab.h" diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index d16262cc1..2c66884ae 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -24,15 +24,12 @@ #include "configuration.h" #include "gamemodifiers.h" -#include "inventory.h" -#include "item.h" #include "settings.h" #include "units.h" #include "gui/windows/chatwindow.h" #include "being/localplayer.h" -#include "being/playerinfo.h" #include "enums/being/attributes.h" @@ -41,7 +38,6 @@ #include "gui/widgets/button.h" #include "gui/widgets/containerplacer.h" -#include "gui/widgets/label.h" #include "gui/widgets/layouthelper.h" #include "gui/widgets/layouttype.h" #include "gui/widgets/progressbar.h" diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index 641df6f3f..e5dbb26b7 100644 --- a/src/gui/windows/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -22,7 +22,6 @@ #include "gui/windows/textcommandeditor.h" -#include "main.h" #include "spellmanager.h" #include "input/keyboardconfig.h" diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index ef2897ccd..5d95c0a4f 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -23,7 +23,6 @@ #include "gui/windows/tradewindow.h" #include "configuration.h" -#include "inventory.h" #include "item.h" #include "units.h" diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp index 9174a0a65..5dc99f720 100644 --- a/src/gui/windows/unregisterdialog.cpp +++ b/src/gui/windows/unregisterdialog.cpp @@ -34,15 +34,11 @@ #include "listeners/wrongdatanoticelistener.h" -#include "net/logindata.h" #include "net/loginhandler.h" #include "utils/delete2.h" #include "utils/gettext.h" -#include <string> -#include <sstream> - #include "debug.h" UnRegisterDialog::UnRegisterDialog(LoginData *const data) : diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 59034cd80..5ea107f35 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -53,8 +53,6 @@ #include "utils/paths.h" #include "utils/process.h" -#include <fstream> - #include <sys/stat.h> #include "debug.h" diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index 7772f04b3..88e4441be 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -26,7 +26,9 @@ #include "configuration.h" #include "guild.h" #include "party.h" +#ifdef TMWA_SUPPORT #include "settings.h" +#endif #include "gui/onlineplayer.h" #include "gui/popupmanager.h" @@ -48,7 +50,9 @@ #include "enums/net/packettypes.h" +#ifdef TMWA_SUPPORT #include "net/download.h" +#endif #include "net/packetlimiter.h" #include "net/playerhandler.h" #include "net/serverfeatures.h" @@ -56,10 +60,6 @@ #include "utils/gettext.h" #include "utils/sdlhelper.h" -#include <SDL_thread.h> -#include <vector> -#include <algorithm> - // Curl should be included after Guichan to avoid Windows redefinitions #include <curl/curl.h> |