diff options
Diffstat (limited to 'src/gui/widgets')
29 files changed, 7 insertions, 74 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index ad139159a..2a009bcc6 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -30,7 +30,6 @@ #include "gui/chatwindow.h" #include "gui/gui.h" -#include "gui/palette.h" #include "gui/sdlfont.h" #include "gui/theme.h" #include "gui/viewport.h" @@ -38,8 +37,6 @@ #include "resources/image.h" #include "resources/resourcemanager.h" -#include "utils/stringutils.h" - #include <guichan/font.hpp> #include "debug.h" diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h index 526db6ef5..b2b135a9c 100644 --- a/src/gui/widgets/avatarlistbox.h +++ b/src/gui/widgets/avatarlistbox.h @@ -19,8 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef GUI_GUILDLISTBOX_H -#define GUI_GUILDLISTBOX_H +#ifndef GUI_AVATARLISTBOX_H +#define GUI_AVATARLISTBOX_H #include "avatar.h" diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp index 5ac13c78e..3f313b0e1 100644 --- a/src/gui/widgets/battletab.cpp +++ b/src/gui/widgets/battletab.cpp @@ -25,7 +25,6 @@ #include "chatlogger.h" #include "commandhandler.h" #include "localplayer.h" -#include "logger.h" #include "main.h" #include "gui/theme.h" @@ -37,7 +36,6 @@ #include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index ea5210eb8..df99905b7 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -27,8 +27,6 @@ #include "graphics.h" #include "logger.h" -#include "utils/stringutils.h" - #include "gui/gui.h" #include "gui/palette.h" #include "gui/sdlfont.h" @@ -37,7 +35,6 @@ #include "gui/widgets/linkhandler.h" #include "resources/image.h" -#include "resources/resource.h" #include "resources/resourcemanager.h" #include <guichan/graphics.hpp> diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 1dd4e1fc8..102fc9546 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -24,15 +24,14 @@ #include "actorspritemanager.h" #include "chatlogger.h" +#include "client.h" #include "commandhandler.h" #include "configuration.h" #include "localplayer.h" -#include "logger.h" #include "sound.h" #include "gui/helpwindow.h" -#include "gui/widgets/browserbox.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/itemlinkhandler.h" #include "gui/widgets/tradetab.h" @@ -44,7 +43,6 @@ #include "resources/itemdb.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include <guichan/widgets/tabbedarea.hpp> diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h index 3d591cf3c..09f2b35ee 100644 --- a/src/gui/widgets/chattab.h +++ b/src/gui/widgets/chattab.h @@ -28,8 +28,6 @@ #include "gui/widgets/browserbox.h" #include "gui/widgets/tab.h" -#include "utils/stringvector.h" - #include "localconsts.h" class ScrollArea; diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index a25a9ef7e..b6bd62fa7 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -36,8 +36,6 @@ #include "resources/resourcemanager.h" #include "resources/wallpaper.h" -#include "utils/stringutils.h" - #include "debug.h" Desktop::Desktop() : diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp index a471ab8ff..af95ffa82 100644 --- a/src/gui/widgets/dropshortcutcontainer.cpp +++ b/src/gui/widgets/dropshortcutcontainer.cpp @@ -28,21 +28,15 @@ #include "gui/theme.h" #include "gui/viewport.h" -#include "configuration.h" +#include "client.h" #include "dropshortcut.h" -#include "graphics.h" -#include "inventory.h" -#include "item.h" #include "keyboardconfig.h" #include "localplayer.h" #include "playerinfo.h" #include "resources/image.h" -#include "resources/iteminfo.h" #include "resources/resourcemanager.h" -#include "utils/stringutils.h" - #include "debug.h" DropShortcutContainer::DropShortcutContainer(): diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index a1b496dc5..cfbfad31d 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -22,6 +22,7 @@ #include "gui/widgets/emoteshortcutcontainer.h" #include "animatedsprite.h" +#include "client.h" #include "configuration.h" #include "emoteshortcut.h" #include "graphics.h" @@ -31,14 +32,11 @@ #include "itemshortcut.h" #include "keyboardconfig.h" #include "localplayer.h" -#include "logger.h" -#include "gui/palette.h" #include "gui/textpopup.h" #include "gui/theme.h" #include "gui/viewport.h" -#include "resources/emotedb.h" #include "resources/image.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp index 61f516d21..8421c22df 100644 --- a/src/gui/widgets/extendedlistbox.cpp +++ b/src/gui/widgets/extendedlistbox.cpp @@ -23,7 +23,6 @@ #include "client.h" #include "configuration.h" #include "keyevent.h" -#include "keydata.h" #include "gui/palette.h" #include "gui/sdlinput.h" @@ -31,8 +30,6 @@ #include "gui/widgets/extendedlistmodel.h" -#include "resources/image.h" - #include <guichan/focushandler.hpp> #include <guichan/font.hpp> #include <guichan/graphics.hpp> diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp index 9fed16e92..39887ef7e 100644 --- a/src/gui/widgets/guildchattab.cpp +++ b/src/gui/widgets/guildchattab.cpp @@ -34,9 +34,7 @@ #include "resources/iteminfo.h" #include "resources/itemdb.h" -#include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index 910ee1910..63ea96db0 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -25,7 +25,6 @@ #include "client.h" #include "configuration.h" #include "keyevent.h" -#include "keydata.h" #include "gui/sdlinput.h" #include "gui/theme.h" diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index f16852673..bff17cfa2 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -27,7 +27,6 @@ #include "item.h" #include "itemshortcut.h" #include "dropshortcut.h" -#include "logger.h" #include "gui/chatwindow.h" #include "gui/gui.h" @@ -44,9 +43,6 @@ #include "net/inventoryhandler.h" #include "resources/image.h" -#include "resources/iteminfo.h" - -#include "utils/stringutils.h" #include <guichan/mouseinput.hpp> #include <guichan/selectionlistener.hpp> diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index 00f310c51..be2c02335 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -29,8 +29,6 @@ #include "utils/process.h" -#include "resources/itemdb.h" - #include <sstream> #include <string> diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 50fc0de0f..2e4da8cbe 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -22,6 +22,7 @@ #include "gui/widgets/itemshortcutcontainer.h" +#include "client.h" #include "configuration.h" #include "graphics.h" #include "inventory.h" @@ -32,21 +33,15 @@ #include "keyboardconfig.h" #include "localplayer.h" #include "playerinfo.h" -#include "spellmanager.h" -#include "textcommand.h" #include "gui/inventorywindow.h" #include "gui/itempopup.h" -#include "gui/palette.h" #include "gui/skilldialog.h" #include "gui/spellpopup.h" #include "gui/theme.h" #include "gui/viewport.h" #include "resources/image.h" -#include "resources/iteminfo.h" - -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h index 59e52b5ae..255a8090e 100644 --- a/src/gui/widgets/itemshortcutcontainer.h +++ b/src/gui/widgets/itemshortcutcontainer.h @@ -23,8 +23,6 @@ #ifndef ITEMSHORTCUTCONTAINER_H #define ITEMSHORTCUTCONTAINER_H -#include "spellmanager.h" - #include "gui/widgets/shortcutcontainer.h" #include <guichan/mouselistener.hpp> diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index 8e5bc0c78..46067df91 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -25,7 +25,6 @@ #include "client.h" #include "configuration.h" #include "keyevent.h" -#include "keydata.h" #include "gui/palette.h" #include "gui/sdlinput.h" diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp index b9f6657a9..51f057621 100644 --- a/src/gui/widgets/playerbox.cpp +++ b/src/gui/widgets/playerbox.cpp @@ -26,7 +26,6 @@ #include "being.h" #include "client.h" #include "configuration.h" -#include "graphics.h" #include "gui/theme.h" diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 34079afb2..228dcc040 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -23,7 +23,6 @@ #include "gui/widgets/popup.h" -#include "configuration.h" #include "graphics.h" #include "graphicsvertexes.h" #include "logger.h" @@ -31,7 +30,6 @@ #include "gui/theme.h" #include "gui/viewport.h" -#include "gui/widgets/windowcontainer.h" #include "gui/widgets/window.h" #include "resources/image.h" diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index 0d0211bcc..10590d72d 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -29,9 +29,7 @@ #include "textrenderer.h" #include "gui/gui.h" -#include "gui/palette.h" #include "gui/sdlfont.h" -#include "gui/theme.h" #include "resources/image.h" diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index bbc809747..ca640421e 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -29,7 +29,6 @@ #include "gui/gui.h" #include "gui/sdlfont.h" -#include "gui/widgets/button.h" #include "gui/widgets/checkbox.h" #include "gui/widgets/dropdown.h" #include "gui/widgets/horizontcontainer.h" @@ -38,8 +37,6 @@ #include "gui/widgets/layouthelper.h" #include "gui/widgets/slider.h" #include "gui/widgets/sliderlist.h" -#include "gui/widgets/tabbedarea.h" -#include "gui/widgets/textfield.h" #include "gui/widgets/vertcontainer.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp index 6c8397bbb..10bdf4045 100644 --- a/src/gui/widgets/shortcutcontainer.cpp +++ b/src/gui/widgets/shortcutcontainer.cpp @@ -26,8 +26,6 @@ #include "resources/image.h" -#include "utils/stringutils.h" - #include "debug.h" float ShortcutContainer::mAlpha = 1.0; diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 630bd7e28..0a130f60e 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -26,7 +26,6 @@ #include "configuration.h" #include "graphics.h" #include "keyevent.h" -#include "keydata.h" #include "gui/theme.h" diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index 25dd3fb6d..a057eceb4 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -31,22 +31,16 @@ #include "gui/textcommandeditor.h" #include "gui/theme.h" -#include "configuration.h" -#include "graphics.h" -#include "inventory.h" +#include "client.h" #include "spellshortcut.h" #include "itemshortcut.h" #include "keyboardconfig.h" #include "localplayer.h" -#include "spellmanager.h" -#include "logger.h" #include "resources/image.h" -#include "textcommand.h" #include "resources/resourcemanager.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 79c48beac..261cdf901 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -26,7 +26,6 @@ #include "configuration.h" #include "graphics.h" #include "keyevent.h" -#include "keydata.h" #include "logger.h" #include "gui/palette.h" @@ -37,7 +36,6 @@ #include "utils/copynpaste.h" #include "utils/dtor.h" -#include "utils/stringutils.h" #include <guichan/font.hpp> diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp index 36533864e..0ec79a5c5 100644 --- a/src/gui/widgets/textpreview.cpp +++ b/src/gui/widgets/textpreview.cpp @@ -27,7 +27,6 @@ #include "textrenderer.h" #include "gui/gui.h" -#include "gui/palette.h" #include "gui/sdlfont.h" #include <typeinfo> diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tradetab.cpp index 5c893de1f..6416fcd8a 100644 --- a/src/gui/widgets/tradetab.cpp +++ b/src/gui/widgets/tradetab.cpp @@ -25,7 +25,6 @@ #include "chatlogger.h" #include "commandhandler.h" #include "localplayer.h" -#include "logger.h" #include "gui/theme.h" @@ -36,7 +35,6 @@ #include "utils/dtor.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp index 2b3b0436f..bb918e3b3 100644 --- a/src/gui/widgets/whispertab.cpp +++ b/src/gui/widgets/whispertab.cpp @@ -25,7 +25,6 @@ #include "chatlogger.h" #include "commandhandler.h" #include "localplayer.h" -#include "logger.h" #include "gui/theme.h" @@ -33,7 +32,6 @@ #include "net/net.h" #include "utils/gettext.h" -#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index c0c3ef94a..2350ed958 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -34,7 +34,6 @@ #include "gui/widgets/layout.h" #include "gui/widgets/resizegrip.h" -#include "gui/widgets/windowcontainer.h" #include "resources/image.h" |