diff options
Diffstat (limited to 'src')
69 files changed, 34 insertions, 455 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index 8e2f3623b..6305be217 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -26,20 +26,15 @@ #include "emoteshortcut.h" #include "game.h" #include "graphicsmanager.h" -#include "guild.h" #include "itemshortcut.h" -#include "soundmanager.h" #include "actions/actiondef.h" #include "being/attributes.h" #include "being/localplayer.h" #include "being/playerinfo.h" -#include "being/playerrelations.h" -#include "gui/chatconsts.h" #include "gui/dialogtype.h" -#include "gui/dialogsmanager.h" #include "gui/gui.h" #include "gui/popupmanager.h" #include "gui/sdlinput.h" @@ -49,32 +44,18 @@ #include "gui/windows/buydialog.h" #include "gui/windows/okdialog.h" -#include "gui/windows/skilldialog.h" -#include "gui/windows/socialwindow.h" -#include "gui/windows/statuswindow.h" #include "gui/windows/tradewindow.h" -#include "gui/windows/questswindow.h" #include "gui/windows/quitdialog.h" -#include "gui/windows/whoisonline.h" -#include "gui/windows/botcheckerwindow.h" #include "gui/windows/buyselldialog.h" #include "gui/windows/chatwindow.h" -#include "gui/windows/debugwindow.h" -#include "gui/windows/didyouknowwindow.h" -#include "gui/windows/equipmentwindow.h" #include "gui/windows/helpwindow.h" -#include "gui/windows/inventorywindow.h" -#include "gui/windows/killstats.h" -#include "gui/windows/minimap.h" #include "gui/windows/npcdialog.h" #include "gui/windows/outfitwindow.h" #include "gui/windows/setupwindow.h" #include "gui/windows/shopwindow.h" #include "gui/windows/shortcutwindow.h" -#include "gui/windows/updaterwindow.h" #include "gui/widgets/tabs/chattab.h" -#include "gui/widgets/tabs/chattabtype.h" #include "render/graphics.h" #if defined USE_OPENGL @@ -87,20 +68,15 @@ #include "net/gamehandler.h" #include "net/ipc.h" #include "net/net.h" -#include "net/uploadcharinfo.h" -#include "net/partyhandler.h" #include "net/playerhandler.h" +#include "net/uploadcharinfo.h" #include "net/tradehandler.h" -#include "listeners/updatestatuslistener.h" - #include "resources/iteminfo.h" #include "resources/resourcemanager.h" #include "resources/db/itemdb.h" -#include "resources/map/map.h" - #include "utils/chatutils.h" #include "utils/delete2.h" #include "utils/gettext.h" @@ -114,7 +90,6 @@ #include "debug.h" -extern ShortcutWindow *spellShortcutWindow; extern std::string tradePartnerName; extern QuitDialog *quitDialog; extern int start_time; diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp index 0a83c4578..feab53e93 100644 --- a/src/actions/chat.cpp +++ b/src/actions/chat.cpp @@ -20,53 +20,15 @@ #include "actions/chat.h" -#include "actormanager.h" -#include "dropshortcut.h" -#include "emoteshortcut.h" -#include "game.h" #include "guildmanager.h" -#include "itemshortcut.h" -#include "soundmanager.h" #include "actions/actiondef.h" -#include "being/attributes.h" #include "being/localplayer.h" -#include "being/playerinfo.h" -#include "being/playerrelations.h" #include "gui/chatconsts.h" -#include "gui/dialogsmanager.h" -#include "gui/gui.h" -#include "gui/popupmanager.h" -#include "gui/sdlinput.h" -#include "gui/viewport.h" - -#include "gui/popups/popupmenu.h" - -#include "gui/windows/skilldialog.h" -#include "gui/windows/socialwindow.h" -#include "gui/windows/statuswindow.h" -#include "gui/windows/tradewindow.h" -#include "gui/windows/questswindow.h" -#include "gui/windows/quitdialog.h" -#include "gui/windows/whoisonline.h" -#include "gui/windows/botcheckerwindow.h" -#include "gui/windows/buyselldialog.h" + #include "gui/windows/chatwindow.h" -#include "gui/windows/debugwindow.h" -#include "gui/windows/didyouknowwindow.h" -#include "gui/windows/equipmentwindow.h" -#include "gui/windows/helpwindow.h" -#include "gui/windows/inventorywindow.h" -#include "gui/windows/killstats.h" -#include "gui/windows/minimap.h" -#include "gui/windows/npcdialog.h" -#include "gui/windows/outfitwindow.h" -#include "gui/windows/setupwindow.h" -#include "gui/windows/shopwindow.h" -#include "gui/windows/shortcutwindow.h" -#include "gui/windows/updaterwindow.h" #include "gui/widgets/tabs/chattab.h" #include "gui/widgets/tabs/chattabtype.h" @@ -82,9 +44,6 @@ #include "debug.h" -extern ShortcutWindow *spellShortcutWindow; -extern std::string tradePartnerName; -extern QuitDialog *quitDialog; extern unsigned int tmwServerVersion; namespace Actions diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp index 78a0df060..daee32717 100644 --- a/src/actions/commands.cpp +++ b/src/actions/commands.cpp @@ -23,51 +23,17 @@ #include "actormanager.h" #include "auctionmanager.h" #include "configuration.h" -#include "dropshortcut.h" -#include "emoteshortcut.h" -#include "game.h" -#include "itemshortcut.h" -#include "soundmanager.h" #include "actions/actiondef.h" -#include "being/attributes.h" #include "being/localplayer.h" -#include "being/playerinfo.h" #include "being/playerrelations.h" #include "gui/chatconsts.h" -#include "gui/dialogsmanager.h" -#include "gui/gui.h" -#include "gui/popupmanager.h" -#include "gui/sdlinput.h" -#include "gui/viewport.h" -#include "gui/popups/popupmenu.h" - -#include "gui/windows/skilldialog.h" -#include "gui/windows/socialwindow.h" -#include "gui/windows/statuswindow.h" -#include "gui/windows/tradewindow.h" -#include "gui/windows/questswindow.h" -#include "gui/windows/quitdialog.h" -#include "gui/windows/whoisonline.h" -#include "gui/windows/botcheckerwindow.h" -#include "gui/windows/buyselldialog.h" #include "gui/windows/chatwindow.h" -#include "gui/windows/debugwindow.h" -#include "gui/windows/didyouknowwindow.h" -#include "gui/windows/equipmentwindow.h" -#include "gui/windows/helpwindow.h" -#include "gui/windows/inventorywindow.h" -#include "gui/windows/killstats.h" -#include "gui/windows/minimap.h" -#include "gui/windows/npcdialog.h" +#include "gui/windows/socialwindow.h" #include "gui/windows/outfitwindow.h" -#include "gui/windows/setupwindow.h" -#include "gui/windows/shopwindow.h" -#include "gui/windows/shortcutwindow.h" -#include "gui/windows/updaterwindow.h" #include "gui/widgets/tabs/whispertab.h" diff --git a/src/actions/move.cpp b/src/actions/move.cpp index 6aca5e7b2..28b51cfe2 100644 --- a/src/actions/move.cpp +++ b/src/actions/move.cpp @@ -20,72 +20,21 @@ #include "actions/move.h" -#include "actormanager.h" -#include "dropshortcut.h" -#include "emoteshortcut.h" #include "game.h" -#include "itemshortcut.h" -#include "soundmanager.h" #include "actions/actiondef.h" -#include "being/attributes.h" #include "being/localplayer.h" -#include "being/playerinfo.h" -#include "being/playerrelations.h" -#include "gui/dialogsmanager.h" -#include "gui/gui.h" -#include "gui/popupmanager.h" -#include "gui/sdlinput.h" -#include "gui/viewport.h" - -#include "gui/popups/popupmenu.h" - -#include "gui/windows/skilldialog.h" #include "gui/windows/socialwindow.h" -#include "gui/windows/statuswindow.h" -#include "gui/windows/tradewindow.h" -#include "gui/windows/questswindow.h" -#include "gui/windows/quitdialog.h" -#include "gui/windows/whoisonline.h" -#include "gui/windows/botcheckerwindow.h" -#include "gui/windows/buyselldialog.h" -#include "gui/windows/chatwindow.h" -#include "gui/windows/debugwindow.h" -#include "gui/windows/didyouknowwindow.h" -#include "gui/windows/equipmentwindow.h" -#include "gui/windows/helpwindow.h" -#include "gui/windows/inventorywindow.h" -#include "gui/windows/killstats.h" -#include "gui/windows/minimap.h" #include "gui/windows/npcdialog.h" #include "gui/windows/outfitwindow.h" -#include "gui/windows/setupwindow.h" -#include "gui/windows/shopwindow.h" -#include "gui/windows/shortcutwindow.h" -#include "gui/windows/updaterwindow.h" - -#include "gui/widgets/tabs/chattab.h" - -#include "render/graphics.h" #include "net/net.h" #include "net/playerhandler.h" -#include "net/tradehandler.h" - -#include "listeners/updatestatuslistener.h" - -#include "resources/map/map.h" - -#include "utils/gettext.h" #include "debug.h" -extern ShortcutWindow *spellShortcutWindow; -extern std::string tradePartnerName; -extern QuitDialog *quitDialog; - namespace Actions { diff --git a/src/actions/statusbar.cpp b/src/actions/statusbar.cpp index d74cc916b..af69bb2b0 100644 --- a/src/actions/statusbar.cpp +++ b/src/actions/statusbar.cpp @@ -20,60 +20,18 @@ #include "actions/statusbar.h" -#include "actormanager.h" -#include "dropshortcut.h" -#include "emoteshortcut.h" #include "game.h" -#include "itemshortcut.h" #include "soundmanager.h" #include "actions/actiondef.h" -#include "being/attributes.h" #include "being/localplayer.h" -#include "being/playerinfo.h" #include "being/playerrelations.h" -#include "gui/dialogsmanager.h" -#include "gui/gui.h" -#include "gui/popupmanager.h" -#include "gui/sdlinput.h" #include "gui/viewport.h" -#include "gui/popups/popupmenu.h" - -#include "gui/windows/skilldialog.h" -#include "gui/windows/socialwindow.h" -#include "gui/windows/statuswindow.h" -#include "gui/windows/tradewindow.h" -#include "gui/windows/questswindow.h" -#include "gui/windows/quitdialog.h" -#include "gui/windows/whoisonline.h" -#include "gui/windows/botcheckerwindow.h" -#include "gui/windows/buyselldialog.h" -#include "gui/windows/chatwindow.h" -#include "gui/windows/debugwindow.h" -#include "gui/windows/didyouknowwindow.h" -#include "gui/windows/equipmentwindow.h" -#include "gui/windows/helpwindow.h" -#include "gui/windows/inventorywindow.h" -#include "gui/windows/killstats.h" -#include "gui/windows/minimap.h" -#include "gui/windows/npcdialog.h" -#include "gui/windows/outfitwindow.h" -#include "gui/windows/setupwindow.h" -#include "gui/windows/shopwindow.h" -#include "gui/windows/shortcutwindow.h" -#include "gui/windows/updaterwindow.h" - #include "gui/widgets/tabs/chattab.h" -#include "render/graphics.h" - -#include "net/net.h" -#include "net/playerhandler.h" -#include "net/tradehandler.h" - #include "listeners/updatestatuslistener.h" #include "resources/map/map.h" @@ -88,10 +46,6 @@ #include "debug.h" -extern ShortcutWindow *spellShortcutWindow; -extern std::string tradePartnerName; -extern QuitDialog *quitDialog; - namespace Actions { diff --git a/src/actions/tabs.cpp b/src/actions/tabs.cpp index ed7944274..7ede6e428 100644 --- a/src/actions/tabs.cpp +++ b/src/actions/tabs.cpp @@ -20,77 +20,14 @@ #include "actions/tabs.h" -#include "actormanager.h" -#include "dropshortcut.h" -#include "emoteshortcut.h" -#include "game.h" -#include "itemshortcut.h" -#include "soundmanager.h" - #include "actions/actiondef.h" -#include "being/attributes.h" -#include "being/localplayer.h" -#include "being/playerinfo.h" -#include "being/playerrelations.h" - -#include "gui/dialogsmanager.h" -#include "gui/gui.h" -#include "gui/popupmanager.h" -#include "gui/sdlinput.h" -#include "gui/viewport.h" - -#include "gui/popups/popupmenu.h" - -#include "gui/windows/skilldialog.h" #include "gui/windows/socialwindow.h" -#include "gui/windows/statuswindow.h" -#include "gui/windows/tradewindow.h" -#include "gui/windows/questswindow.h" -#include "gui/windows/quitdialog.h" -#include "gui/windows/whoisonline.h" -#include "gui/windows/botcheckerwindow.h" -#include "gui/windows/buyselldialog.h" -#include "gui/windows/chatwindow.h" -#include "gui/windows/debugwindow.h" -#include "gui/windows/didyouknowwindow.h" -#include "gui/windows/equipmentwindow.h" -#include "gui/windows/helpwindow.h" -#include "gui/windows/inventorywindow.h" -#include "gui/windows/killstats.h" -#include "gui/windows/minimap.h" -#include "gui/windows/npcdialog.h" -#include "gui/windows/outfitwindow.h" -#include "gui/windows/setupwindow.h" -#include "gui/windows/shopwindow.h" #include "gui/windows/shortcutwindow.h" -#include "gui/windows/updaterwindow.h" - -#include "gui/widgets/tabs/chattab.h" - -#include "render/graphics.h" - -#include "net/net.h" -#include "net/playerhandler.h" -#include "net/tradehandler.h" - -#include "listeners/updatestatuslistener.h" - -#include "resources/map/map.h" - -#include "utils/gettext.h" - -#ifdef ANDROID -#ifndef USE_SDL2 -#include <SDL_screenkeyboard.h> -#endif -#endif #include "debug.h" extern ShortcutWindow *spellShortcutWindow; -extern std::string tradePartnerName; -extern QuitDialog *quitDialog; namespace Actions { diff --git a/src/actions/target.cpp b/src/actions/target.cpp index e183a6a2c..c5772c1b5 100644 --- a/src/actions/target.cpp +++ b/src/actions/target.cpp @@ -21,71 +21,13 @@ #include "actions/target.h" #include "actormanager.h" -#include "dropshortcut.h" -#include "emoteshortcut.h" -#include "game.h" -#include "itemshortcut.h" -#include "soundmanager.h" #include "actions/actiondef.h" -#include "being/attributes.h" #include "being/localplayer.h" -#include "being/playerinfo.h" -#include "being/playerrelations.h" - -#include "gui/dialogsmanager.h" -#include "gui/gui.h" -#include "gui/popupmanager.h" -#include "gui/sdlinput.h" -#include "gui/viewport.h" - -#include "gui/popups/popupmenu.h" - -#include "gui/windows/skilldialog.h" -#include "gui/windows/socialwindow.h" -#include "gui/windows/statuswindow.h" -#include "gui/windows/tradewindow.h" -#include "gui/windows/questswindow.h" -#include "gui/windows/quitdialog.h" -#include "gui/windows/whoisonline.h" -#include "gui/windows/botcheckerwindow.h" -#include "gui/windows/buyselldialog.h" -#include "gui/windows/chatwindow.h" -#include "gui/windows/debugwindow.h" -#include "gui/windows/didyouknowwindow.h" -#include "gui/windows/equipmentwindow.h" -#include "gui/windows/helpwindow.h" -#include "gui/windows/inventorywindow.h" -#include "gui/windows/killstats.h" -#include "gui/windows/minimap.h" -#include "gui/windows/npcdialog.h" -#include "gui/windows/outfitwindow.h" -#include "gui/windows/setupwindow.h" -#include "gui/windows/shopwindow.h" -#include "gui/windows/shortcutwindow.h" -#include "gui/windows/updaterwindow.h" - -#include "gui/widgets/tabs/chattab.h" - -#include "render/graphics.h" - -#include "net/net.h" -#include "net/playerhandler.h" -#include "net/tradehandler.h" - -#include "listeners/updatestatuslistener.h" - -#include "resources/map/map.h" - -#include "utils/gettext.h" #include "debug.h" -extern ShortcutWindow *spellShortcutWindow; -extern std::string tradePartnerName; -extern QuitDialog *quitDialog; - namespace Actions { diff --git a/src/actions/windows.cpp b/src/actions/windows.cpp index f2fcfa85a..4fcde2a52 100644 --- a/src/actions/windows.cpp +++ b/src/actions/windows.cpp @@ -20,37 +20,16 @@ #include "actions/windows.h" -#include "actormanager.h" -#include "dropshortcut.h" -#include "emoteshortcut.h" -#include "game.h" -#include "itemshortcut.h" -#include "soundmanager.h" - #include "actions/actiondef.h" -#include "being/attributes.h" -#include "being/localplayer.h" -#include "being/playerinfo.h" -#include "being/playerrelations.h" - #include "gui/dialogsmanager.h" -#include "gui/gui.h" -#include "gui/popupmanager.h" -#include "gui/sdlinput.h" -#include "gui/viewport.h" - -#include "gui/popups/popupmenu.h" #include "gui/windows/skilldialog.h" #include "gui/windows/socialwindow.h" #include "gui/windows/statuswindow.h" -#include "gui/windows/tradewindow.h" #include "gui/windows/questswindow.h" -#include "gui/windows/quitdialog.h" #include "gui/windows/whoisonline.h" #include "gui/windows/botcheckerwindow.h" -#include "gui/windows/buyselldialog.h" #include "gui/windows/chatwindow.h" #include "gui/windows/debugwindow.h" #include "gui/windows/didyouknowwindow.h" @@ -59,7 +38,6 @@ #include "gui/windows/inventorywindow.h" #include "gui/windows/killstats.h" #include "gui/windows/minimap.h" -#include "gui/windows/npcdialog.h" #include "gui/windows/outfitwindow.h" #include "gui/windows/setupwindow.h" #include "gui/windows/shopwindow.h" @@ -69,21 +47,9 @@ #include "gui/widgets/tabs/chattab.h" #include "gui/widgets/tabs/chattabtype.h" -#include "render/graphics.h" - -#include "net/net.h" -#include "net/playerhandler.h" -#include "net/tradehandler.h" - -#include "listeners/updatestatuslistener.h" - -#include "resources/map/map.h" - #include "debug.h" extern ShortcutWindow *spellShortcutWindow; -extern std::string tradePartnerName; -extern QuitDialog *quitDialog; namespace Actions { diff --git a/src/client.cpp b/src/client.cpp index 4689c8819..a816c8f1c 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -52,22 +52,17 @@ #include "input/keyboardconfig.h" #include "gui/dialogsmanager.h" +#include "gui/dialogtype.h" #include "gui/gui.h" #include "gui/skin.h" #include "gui/popupmanager.h" #include "gui/theme.h" #include "gui/windowmanager.h" -#include "gui/popups/beingpopup.h" -#include "gui/popups/popupmenu.h" -#include "gui/popups/textpopup.h" - #include "gui/windows/changeemaildialog.h" #include "gui/windows/changepassworddialog.h" #include "gui/windows/charselectdialog.h" #include "gui/windows/connectiondialog.h" -#include "gui/windows/didyouknowwindow.h" -#include "gui/windows/helpwindow.h" #include "gui/windows/logindialog.h" #include "gui/windows/npcdialog.h" #include "gui/windows/okdialog.h" diff --git a/src/gui/dialogsmanager.cpp b/src/gui/dialogsmanager.cpp index a318049c2..83fc286ca 100644 --- a/src/gui/dialogsmanager.cpp +++ b/src/gui/dialogsmanager.cpp @@ -25,6 +25,8 @@ #include "configuration.h" #include "settings.h" +#include "gui/dialogtype.h" + #include "gui/windows/confirmdialog.h" #include "gui/windows/buyselldialog.h" #include "gui/windows/buydialog.h" diff --git a/src/gui/popupmanager.cpp b/src/gui/popupmanager.cpp index 4c18af585..9b254746e 100644 --- a/src/gui/popupmanager.cpp +++ b/src/gui/popupmanager.cpp @@ -24,14 +24,10 @@ #include "sdlshared.h" -#include "gui/viewport.h" - #include "gui/popups/beingpopup.h" #include "gui/popups/popupmenu.h" #include "gui/popups/textpopup.h" -#include "utils/delete2.h" - #include "debug.h" PopupManager *popupManager = nullptr; diff --git a/src/gui/popupmanager.h b/src/gui/popupmanager.h index bf0f1c804..c34934798 100644 --- a/src/gui/popupmanager.h +++ b/src/gui/popupmanager.h @@ -23,28 +23,8 @@ #ifndef GUI_POPUPMANAGER_H #define GUI_POPUPMANAGER_H -#include "being/actortype.h" - -#include <string> -#include <vector> - #include "localconsts.h" -class ActorSprite; -class Button; -class Being; -class BeingPopup; -class ChatTab; -class FloorItem; -class Item; -class MapItem; -class PopupMenu; -class ProgressBar; -class TextCommand; -class TextField; -class TextPopup; -class Window; - class PopupManager final { public: diff --git a/src/gui/setupinputpages.cpp b/src/gui/setupinputpages.cpp index d4674a702..8536d8295 100644 --- a/src/gui/setupinputpages.cpp +++ b/src/gui/setupinputpages.cpp @@ -23,8 +23,6 @@ #include "gui/setupinputpages.h" -#include "gui/setupactiondata.h" - #include "utils/gettext.h" #include "input/pages/basic.h" diff --git a/src/gui/touchactiondata.cpp b/src/gui/touchactiondata.cpp index 2f970eaf8..724c48890 100644 --- a/src/gui/touchactiondata.cpp +++ b/src/gui/touchactiondata.cpp @@ -20,11 +20,8 @@ #include "gui/touchactiondata.h" -#include "gui/setupactiondata.h" - #include "input/pages/basic.h" #include "input/pages/chat.h" -#include "input/pages/gui.h" #include "input/pages/other.h" #include "input/pages/windows.h" diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h index 47959e365..866e3e580 100644 --- a/src/gui/widgets/characterdisplay.h +++ b/src/gui/widgets/characterdisplay.h @@ -32,7 +32,6 @@ class CharSelectDialog; class Label; -class TextPopup; namespace Net { diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index c07482e1b..d76683256 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -39,7 +39,6 @@ #include "resources/db/emotedb.h" #include "utils/stringutils.h" -#include "utils/delete2.h" #include "debug.h" diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h index 8a2ea498e..dea9e6dec 100644 --- a/src/gui/widgets/emoteshortcutcontainer.h +++ b/src/gui/widgets/emoteshortcutcontainer.h @@ -26,8 +26,6 @@ #include <vector> -class TextPopup; - struct EmoteSprite; /** diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 37e0c0ffd..54bb74596 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -52,8 +52,6 @@ #include "listeners/selectionlistener.h" -#include "utils/delete2.h" - #include <algorithm> #include "debug.h" diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index 3f56f8855..42b4fa036 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -36,7 +36,6 @@ class Image; class Inventory; class Item; -class ItemPopup; class SelectionListener; /** diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index 589f8f6d1..6c04ca41f 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -22,7 +22,6 @@ #include "gui/widgets/itemlinkhandler.h" -#include "gui/popupmanager.h" #include "gui/viewport.h" #include "gui/popups/itempopup.h" @@ -31,7 +30,6 @@ #include "gui/windows/confirmdialog.h" #include "gui/windows/helpwindow.h" -#include "utils/delete2.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h index c07ede9ad..956bd3df4 100644 --- a/src/gui/widgets/itemlinkhandler.h +++ b/src/gui/widgets/itemlinkhandler.h @@ -27,8 +27,6 @@ #include "localconsts.h" -class ItemPopup; - class ItemLinkHandler final : public LinkHandler { public: diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index df86c45ae..03242d484 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -33,7 +33,6 @@ #include "input/inputmanager.h" -#include "gui/popupmanager.h" #include "gui/viewport.h" #include "gui/fonts/font.h" @@ -50,7 +49,6 @@ #include "resources/image.h" #include "resources/skillconsts.h" -#include "utils/delete2.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h index d1f959bcd..29aec0a8c 100644 --- a/src/gui/widgets/itemshortcutcontainer.h +++ b/src/gui/widgets/itemshortcutcontainer.h @@ -25,9 +25,6 @@ #include "gui/widgets/shortcutcontainer.h" -class ItemPopup; -class SpellPopup; - /** * An item shortcut container. Used to quickly use items. * diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index a2161d96d..f35c83663 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -27,7 +27,6 @@ #include "being/playerinfo.h" -#include "gui/popupmanager.h" #include "gui/viewport.h" #include "gui/fonts/font.h" diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h index 808528cc5..9f6d21e79 100644 --- a/src/gui/widgets/shoplistbox.h +++ b/src/gui/widgets/shoplistbox.h @@ -26,7 +26,6 @@ #include "gui/widgets/listbox.h" class ShopItems; -class ItemPopup; /** * A list box, meant to be used inside a scroll area. Same as the Guichan list diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index 0257cea08..bbfb8f497 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -27,7 +27,6 @@ #include "settings.h" #include "spellshortcut.h" -#include "gui/popupmanager.h" #include "gui/viewport.h" #include "gui/fonts/font.h" @@ -39,8 +38,6 @@ #include "resources/image.h" -#include "utils/delete2.h" - #include "debug.h" SpellShortcutContainer::SpellShortcutContainer(Widget2 *const widget, diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h index 939e315af..b7a68d18d 100644 --- a/src/gui/widgets/spellshortcutcontainer.h +++ b/src/gui/widgets/spellshortcutcontainer.h @@ -25,8 +25,6 @@ #include "gui/widgets/shortcutcontainer.h" -class SpellPopup; - /** * An item shortcut container. Used to quickly use items. * diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp index 5185ad4eb..3c467f046 100644 --- a/src/gui/widgets/tabs/setup_input.cpp +++ b/src/gui/widgets/tabs/setup_input.cpp @@ -29,11 +29,11 @@ #include "input/keyboardconfig.h" #include "input/pages/emotes.h" -#include "input/pages/gui.h" #include "input/pages/move.h" #include "input/pages/outfits.h" #include "input/pages/shortcuts.h" +#include "gui/dialogtype.h" #include "gui/gui.h" #include "gui/setupinputpages.h" diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp index c74a8bade..47fa7374e 100644 --- a/src/gui/widgets/tabs/setup_theme.cpp +++ b/src/gui/widgets/tabs/setup_theme.cpp @@ -22,6 +22,7 @@ #include "gui/widgets/tabs/setup_theme.h" +#include "gui/dialogtype.h" #include "gui/gui.h" #include "gui/themeinfo.h" diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index 41cf19a7f..2ef45e6b6 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -26,6 +26,7 @@ #include "graphicsmanager.h" +#include "gui/dialogtype.h" #include "gui/windowmanager.h" #include "gui/windows/okdialog.h" diff --git a/src/gui/widgets/virtshortcutcontainer.cpp b/src/gui/widgets/virtshortcutcontainer.cpp index 2b0353148..d786289b0 100644 --- a/src/gui/widgets/virtshortcutcontainer.cpp +++ b/src/gui/widgets/virtshortcutcontainer.cpp @@ -28,7 +28,6 @@ #include "being/playerinfo.h" -#include "gui/popupmanager.h" #include "gui/viewport.h" #include "gui/fonts/font.h" @@ -40,7 +39,6 @@ #include "resources/image.h" -#include "utils/delete2.h" #include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/virtshortcutcontainer.h b/src/gui/widgets/virtshortcutcontainer.h index e740b9661..330d53171 100644 --- a/src/gui/widgets/virtshortcutcontainer.h +++ b/src/gui/widgets/virtshortcutcontainer.h @@ -25,7 +25,6 @@ #include "gui/widgets/shortcutcontainer.h" -class ItemPopup; class ShortcutBase; /** diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index dfbfc5d3d..26d32bb3d 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -38,7 +38,6 @@ #include "gui/widgets/button.h" -#include "utils/delete2.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp index 3df98f589..84da15ead 100644 --- a/src/gui/windows/changeemaildialog.cpp +++ b/src/gui/windows/changeemaildialog.cpp @@ -24,6 +24,8 @@ #include "client.h" +#include "gui/dialogtype.h" + #include "gui/windows/okdialog.h" #include "gui/widgets/button.h" diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp index 0ec8999dc..875fb2c3d 100644 --- a/src/gui/windows/changepassworddialog.cpp +++ b/src/gui/windows/changepassworddialog.cpp @@ -24,6 +24,8 @@ #include "client.h" +#include "gui/dialogtype.h" + #include "gui/windows/okdialog.h" #include "gui/widgets/button.h" diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 765436ffb..e1c1cd7ed 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -28,6 +28,8 @@ #include "input/inputaction.h" +#include "gui/dialogtype.h" + #include "gui/windows/okdialog.h" #include "gui/widgets/button.h" diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 17e2510bb..134aa2712 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -32,6 +32,8 @@ #include "being/attributes.h" +#include "gui/dialogtype.h" + #include "gui/windows/charcreatedialog.h" #include "gui/windows/chardeleteconfirm.h" #include "gui/windows/logindialog.h" diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index d18f28a9e..e5be2fc65 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -42,7 +42,6 @@ #include "gui/chatconsts.h" #include "gui/focushandler.h" #include "gui/gui.h" -#include "gui/popupmanager.h" #include "gui/skin.h" #include "gui/viewport.h" diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp index a89b36562..11f22fafe 100644 --- a/src/gui/windows/editserverdialog.cpp +++ b/src/gui/windows/editserverdialog.cpp @@ -25,6 +25,8 @@ #include "input/inputaction.h" +#include "gui/dialogtype.h" + #include "gui/models/typelistmodel.h" #include "gui/windows/okdialog.h" diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h index b90c39d81..30fdcc366 100644 --- a/src/gui/windows/equipmentwindow.h +++ b/src/gui/windows/equipmentwindow.h @@ -39,7 +39,6 @@ class Button; class Image; class ImageSet; class Item; -class ItemPopup; class PlayerBox; struct EquipmentBox; diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp index 91e05bcdb..d4fece698 100644 --- a/src/gui/windows/helpwindow.cpp +++ b/src/gui/windows/helpwindow.cpp @@ -28,7 +28,6 @@ #include "gui/gui.h" -#include "gui/windows/didyouknowwindow.h" #include "gui/windows/setupwindow.h" #include "gui/widgets/button.h" diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 3865647e0..2c38c0358 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -34,7 +34,6 @@ #include "input/inputmanager.h" #include "gui/gui.h" -#include "gui/popupmanager.h" #include "gui/fonts/font.h" @@ -43,11 +42,8 @@ #include "gui/popups/popupmenu.h" #include "gui/popups/textpopup.h" -#include "gui/windows/equipmentwindow.h" #include "gui/windows/itemamountwindow.h" -#include "gui/windows/outfitwindow.h" #include "gui/windows/setupwindow.h" -#include "gui/windows/shopwindow.h" #include "gui/windows/tradewindow.h" #include "gui/widgets/button.h" diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index 509b74390..98cac78a6 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -42,7 +42,6 @@ class ProgressBar; class SortListModelInv; class TabStrip; class TextField; -class TextPopup; /** * Inventory dialog. diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index 67dc5ee75..d7760444a 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -48,8 +48,6 @@ #include "gui/widgets/label.h" #include "gui/widgets/slider.h" -#include "utils/delete2.h" - #include <cmath> #include "debug.h" diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h index 04d08613d..d4f7fb3bc 100644 --- a/src/gui/windows/itemamountwindow.h +++ b/src/gui/windows/itemamountwindow.h @@ -33,7 +33,6 @@ class Icon; class IntTextField; class Item; class ItemsModal; -class ItemPopup; class Label; class Slider; diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 31d8169d1..b3a131960 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -44,7 +44,6 @@ #include "resources/map/map.h" #include "resources/map/metatile.h" -#include "utils/delete2.h" #include "utils/gettext.h" #include "utils/physfstools.h" #include "utils/sdlcheckutils.h" diff --git a/src/gui/windows/minimap.h b/src/gui/windows/minimap.h index becf50f7b..6556274a7 100644 --- a/src/gui/windows/minimap.h +++ b/src/gui/windows/minimap.h @@ -27,7 +27,6 @@ class Image; class Map; -class TextPopup; /** * Minimap window. Shows a minimap image and the name of the current map. diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h index e97d90ed0..18acb41fb 100644 --- a/src/gui/windows/ministatuswindow.h +++ b/src/gui/windows/ministatuswindow.h @@ -38,7 +38,6 @@ class Graphics; class Inventory; class ProgressBar; class StatusPopup; -class TextPopup; /** * The player mini-status dialog. diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 584776726..ef6a1b1ad 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -33,7 +33,6 @@ #include "being/being.h" #include "gui/gui.h" -#include "gui/popupmanager.h" #include "gui/viewport.h" #include "gui/fonts/font.h" diff --git a/src/gui/windows/okdialog.cpp b/src/gui/windows/okdialog.cpp index 549723e14..b6c3bfc41 100644 --- a/src/gui/windows/okdialog.cpp +++ b/src/gui/windows/okdialog.cpp @@ -25,6 +25,8 @@ #include "soundconsts.h" #include "soundmanager.h" +#include "gui/dialogtype.h" + #include "gui/widgets/button.h" #include "gui/widgets/textbox.h" diff --git a/src/gui/windows/okdialog.h b/src/gui/windows/okdialog.h index f3fb09030..cbe3a7886 100644 --- a/src/gui/windows/okdialog.h +++ b/src/gui/windows/okdialog.h @@ -23,8 +23,6 @@ #ifndef GUI_WINDOWS_OKDIALOG_H #define GUI_WINDOWS_OKDIALOG_H -#include "gui/dialogtype.h" - #include "gui/widgets/window.h" #include "listeners/actionlistener.h" diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index cc162d0ca..5a773c58d 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -33,7 +33,6 @@ #include "input/inputmanager.h" -#include "gui/popupmanager.h" #include "gui/viewport.h" #include "gui/popups/popupmenu.h" diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index aca34dd5d..6ac30634b 100644 --- a/src/gui/windows/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -30,6 +30,8 @@ #include "listeners/wrongdatanoticelistener.h" +#include "gui/dialogtype.h" + #include "gui/windows/okdialog.h" #include "gui/widgets/button.h" diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 790bad68d..be5cbea11 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -28,6 +28,8 @@ #include "being/localplayer.h" #include "being/playerrelations.h" +#include "gui/dialogtype.h" + #include "gui/windows/confirmdialog.h" #include "gui/windows/okdialog.h" #include "gui/windows/setupwindow.h" diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp index aa7c67148..0135cb7c9 100644 --- a/src/gui/windows/unregisterdialog.cpp +++ b/src/gui/windows/unregisterdialog.cpp @@ -24,6 +24,8 @@ #include "client.h" +#include "gui/dialogtype.h" + #include "gui/windows/okdialog.h" #include "gui/widgets/button.h" diff --git a/src/input/pages/basic.cpp b/src/input/pages/basic.cpp index ee65d48fe..9d158f0be 100644 --- a/src/input/pages/basic.cpp +++ b/src/input/pages/basic.cpp @@ -24,10 +24,8 @@ #include "gui/setupactiondata.h" #include "input/inputaction.h" -#include "input/inputactiondata.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/input/pages/chat.cpp b/src/input/pages/chat.cpp index 749752ab6..3f95703bd 100644 --- a/src/input/pages/chat.cpp +++ b/src/input/pages/chat.cpp @@ -21,10 +21,8 @@ #include "gui/setupactiondata.h" #include "input/inputaction.h" -#include "input/inputactiondata.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/input/pages/emotes.cpp b/src/input/pages/emotes.cpp index 8ccb010de..26b3e9305 100644 --- a/src/input/pages/emotes.cpp +++ b/src/input/pages/emotes.cpp @@ -24,7 +24,6 @@ #include "gui/setupactiondata.h" #include "input/inputaction.h" -#include "input/inputactiondata.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/input/pages/gui.cpp b/src/input/pages/gui.cpp index b4dd198d5..03ded1376 100644 --- a/src/input/pages/gui.cpp +++ b/src/input/pages/gui.cpp @@ -21,10 +21,8 @@ #include "gui/setupactiondata.h" #include "input/inputaction.h" -#include "input/inputactiondata.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/input/pages/move.cpp b/src/input/pages/move.cpp index 5a8c157fa..fb027b9d4 100644 --- a/src/input/pages/move.cpp +++ b/src/input/pages/move.cpp @@ -24,7 +24,6 @@ #include "gui/setupactiondata.h" #include "input/inputaction.h" -#include "input/inputactiondata.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/input/pages/other.cpp b/src/input/pages/other.cpp index 9d16f4b8a..59a698bc3 100644 --- a/src/input/pages/other.cpp +++ b/src/input/pages/other.cpp @@ -24,10 +24,8 @@ #include "gui/setupactiondata.h" #include "input/inputaction.h" -#include "input/inputactiondata.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/input/pages/outfits.cpp b/src/input/pages/outfits.cpp index 63bb9a67a..a9ca346ed 100644 --- a/src/input/pages/outfits.cpp +++ b/src/input/pages/outfits.cpp @@ -24,7 +24,6 @@ #include "gui/setupactiondata.h" #include "input/inputaction.h" -#include "input/inputactiondata.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/input/pages/shortcuts.cpp b/src/input/pages/shortcuts.cpp index 1a80cd896..5ca94cae4 100644 --- a/src/input/pages/shortcuts.cpp +++ b/src/input/pages/shortcuts.cpp @@ -24,7 +24,6 @@ #include "gui/setupactiondata.h" #include "input/inputaction.h" -#include "input/inputactiondata.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/input/pages/windows.cpp b/src/input/pages/windows.cpp index e8318cbfa..f16b1b34f 100644 --- a/src/input/pages/windows.cpp +++ b/src/input/pages/windows.cpp @@ -24,10 +24,8 @@ #include "gui/setupactiondata.h" #include "input/inputaction.h" -#include "input/inputactiondata.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/logger.cpp b/src/logger.cpp index e6aeb0546..d53ebc99b 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -22,9 +22,8 @@ #include "logger.h" -#include <sstream> - #include <iostream> +#include <sstream> #ifdef WIN32 #include <windows.h> diff --git a/src/logger.h b/src/logger.h index c68277ce5..66e5d0ea7 100644 --- a/src/logger.h +++ b/src/logger.h @@ -25,15 +25,13 @@ #include "main.h" -#include <SDL_thread.h> +#include <SDL_mutex.h> #include <fstream> #include <vector> #include "localconsts.h" -class ChatWindow; - #ifdef ENABLEDEBUGLOG #define DEBUGLOG(msg) if (logger) logger->dlog(msg) #else diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index 870ed1413..fa044e83a 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -26,6 +26,8 @@ #include "configuration.h" #include "settings.h" +#include "gui/dialogtype.h" + #include "gui/windows/charcreatedialog.h" #include "gui/windows/okdialog.h" diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index f569ef420..653a014c7 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -28,6 +28,8 @@ #include "being/localplayer.h" +#include "gui/dialogtype.h" + #include "gui/windows/okdialog.h" #include "net/messagein.h" diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index d930ff7ba..b44b793cb 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -31,6 +31,7 @@ #include "being/attributes.h" #include "being/localplayer.h" +#include "gui/dialogtype.h" #include "gui/viewport.h" #include "gui/windows/okdialog.h" |