diff options
Diffstat (limited to 'src/gui/widgets')
44 files changed, 2 insertions, 105 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 5dd7277df..1f5556a5d 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -23,7 +23,6 @@ #include "actorspritemanager.h" #include "configuration.h" -#include "graphics.h" #include "guild.h" #include "localplayer.h" #include "maplayer.h" @@ -31,7 +30,6 @@ #include "gui/chatwindow.h" #include "gui/gui.h" #include "gui/sdlfont.h" -#include "gui/theme.h" #include "gui/viewport.h" #include "resources/image.h" diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp index 2e060dca1..f448dd057 100644 --- a/src/gui/widgets/battletab.cpp +++ b/src/gui/widgets/battletab.cpp @@ -27,8 +27,6 @@ #include "localplayer.h" #include "main.h" -#include "gui/theme.h" - #include "net/net.h" #include "resources/iteminfo.h" diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 23fe456ed..4d0e5e32c 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -24,13 +24,9 @@ #include "gui/widgets/browserbox.h" #include "client.h" -#include "graphics.h" -#include "logger.h" #include "gui/gui.h" -#include "gui/palette.h" #include "gui/sdlfont.h" -#include "gui/theme.h" #include "gui/widgets/linkhandler.h" diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc index 88e8143c3..358f816c7 100644 --- a/src/gui/widgets/browserbox_unittest.cc +++ b/src/gui/widgets/browserbox_unittest.cc @@ -39,7 +39,7 @@ TEST(browserbox, test1) PHYSFS_init("manaplus"); logger = new Logger(); Theme *theme = Theme::instance(); - BrowserBox *box = new BrowserBox(BrowserBox::AUTO_WRAP); + BrowserBox *box = new BrowserBox(nullptr, BrowserBox::AUTO_WRAP); box->setWidth(100); std::string row = "test"; box->addRow(row); diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index f157f1096..31bde646f 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -24,14 +24,9 @@ #include "client.h" #include "configuration.h" -#include "graphics.h" #include "graphicsvertexes.h" #include "keydata.h" #include "keyevent.h" -#include "logger.h" - -#include "gui/palette.h" -#include "gui/theme.h" #include "resources/imageset.h" diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index 7377a5325..0c2b7ca14 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -24,13 +24,9 @@ #include "client.h" #include "configuration.h" -#include "graphics.h" #include "keydata.h" #include "keyevent.h" -#include "gui/palette.h" -#include "gui/theme.h" - #include "resources/image.h" #include <guichan/actionlistener.hpp> diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index 65c7eda77..0a6657d3e 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -22,13 +22,8 @@ #include "gui/widgets/desktop.h" #include "configuration.h" -#include "graphics.h" -#include "logger.h" #include "main.h" -#include "gui/palette.h" -#include "gui/theme.h" - #include "gui/widgets/label.h" #include "resources/image.h" diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 5c4c02259..a896b4698 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -24,13 +24,10 @@ #include "client.h" #include "configuration.h" -#include "graphics.h" #include "keydata.h" #include "keyevent.h" -#include "gui/palette.h" #include "gui/sdlinput.h" -#include "gui/theme.h" #include "gui/widgets/listbox.h" #include "gui/widgets/scrollarea.h" diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp index 732b94454..95a09533e 100644 --- a/src/gui/widgets/dropshortcutcontainer.cpp +++ b/src/gui/widgets/dropshortcutcontainer.cpp @@ -24,8 +24,6 @@ #include "gui/inventorywindow.h" #include "gui/itempopup.h" -#include "gui/palette.h" -#include "gui/theme.h" #include "gui/viewport.h" #include "client.h" diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index 87719b775..79abadf9c 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -25,7 +25,6 @@ #include "client.h" #include "configuration.h" #include "emoteshortcut.h" -#include "graphics.h" #include "inputmanager.h" #include "inventory.h" #include "item.h" @@ -34,7 +33,6 @@ #include "localplayer.h" #include "gui/textpopup.h" -#include "gui/theme.h" #include "gui/viewport.h" #include "resources/image.h" diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp index 1091c957f..f1b41c03f 100644 --- a/src/gui/widgets/extendedlistbox.cpp +++ b/src/gui/widgets/extendedlistbox.cpp @@ -24,9 +24,7 @@ #include "configuration.h" #include "keyevent.h" -#include "gui/palette.h" #include "gui/sdlinput.h" -#include "gui/theme.h" #include "gui/widgets/extendedlistmodel.h" diff --git a/src/gui/widgets/extendednamesmodel.cpp b/src/gui/widgets/extendednamesmodel.cpp index 0a01df626..60a814de7 100644 --- a/src/gui/widgets/extendednamesmodel.cpp +++ b/src/gui/widgets/extendednamesmodel.cpp @@ -20,8 +20,6 @@ #include "gui/widgets/extendednamesmodel.h" -#include "logger.h" - #include "utils/gettext.h" #include <guichan/font.hpp> diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp index 1b80801cb..7b1ca5bd3 100644 --- a/src/gui/widgets/guildchattab.cpp +++ b/src/gui/widgets/guildchattab.cpp @@ -29,8 +29,6 @@ #include "localplayer.h" #include "sound.h" -#include "gui/theme.h" - #include "resources/iteminfo.h" #include "resources/itemdb.h" diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index d661e23df..4e966599e 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -27,7 +27,6 @@ #include "keyevent.h" #include "gui/sdlinput.h" -#include "gui/theme.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp index 9781e978f..e152d3c4b 100644 --- a/src/gui/widgets/icon.cpp +++ b/src/gui/widgets/icon.cpp @@ -22,8 +22,6 @@ #include "gui/widgets/icon.h" -#include "graphics.h" - #include "resources/image.h" #include "resources/resourcemanager.h" diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp index eb04a65aa..e1b8df730 100644 --- a/src/gui/widgets/inttextfield.cpp +++ b/src/gui/widgets/inttextfield.cpp @@ -27,7 +27,7 @@ #include "gui/sdlinput.h" -#include "utils/stringutils.h" +//#include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 159a06d19..7e71287fe 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -22,7 +22,6 @@ #include "gui/widgets/itemcontainer.h" -#include "graphics.h" #include "inventory.h" #include "item.h" #include "itemshortcut.h" @@ -32,11 +31,9 @@ #include "gui/gui.h" #include "gui/itempopup.h" #include "gui/outfitwindow.h" -#include "gui/palette.h" #include "gui/shopwindow.h" #include "gui/shortcutwindow.h" #include "gui/sdlinput.h" -#include "gui/theme.h" #include "gui/viewport.h" #include "net/net.h" diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 041a9e8dc..ccc8cb4c3 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -24,7 +24,6 @@ #include "client.h" #include "configuration.h" -#include "graphics.h" #include "inventory.h" #include "inputmanager.h" #include "item.h" @@ -38,7 +37,6 @@ #include "gui/itempopup.h" #include "gui/skilldialog.h" #include "gui/spellpopup.h" -#include "gui/theme.h" #include "gui/viewport.h" #include "resources/image.h" diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp index e7481e992..0286caa7f 100644 --- a/src/gui/widgets/label.cpp +++ b/src/gui/widgets/label.cpp @@ -21,8 +21,6 @@ #include "gui/widgets/label.h" -#include "gui/theme.h" - #include <guichan/font.hpp> #include "debug.h" diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index a323d154c..b90522229 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -27,9 +27,7 @@ #include "keyevent.h" #include "gui/gui.h" -#include "gui/palette.h" #include "gui/sdlinput.h" -#include "gui/theme.h" #include <guichan/focushandler.hpp> #include <guichan/font.hpp> diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp index 697174fa2..4511a8544 100644 --- a/src/gui/widgets/playerbox.cpp +++ b/src/gui/widgets/playerbox.cpp @@ -27,8 +27,6 @@ #include "client.h" #include "configuration.h" -#include "gui/theme.h" - #include "resources/image.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h index bc93b2e3f..90ef929af 100644 --- a/src/gui/widgets/playerbox.h +++ b/src/gui/widgets/playerbox.h @@ -27,8 +27,6 @@ #include <guichan/widgets/scrollarea.hpp> -#include "graphics.h" - #include "localconsts.h" class Being; diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 9763541a5..b870d2eb1 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -23,11 +23,8 @@ #include "gui/widgets/popup.h" -#include "graphics.h" #include "graphicsvertexes.h" -#include "logger.h" -#include "gui/theme.h" #include "gui/viewport.h" #include "gui/widgets/window.h" diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index 75aa3063c..590447b89 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -24,7 +24,6 @@ #include "client.h" #include "configuration.h" -#include "graphics.h" #include "graphicsvertexes.h" #include "textrenderer.h" diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp index 8ddd755ff..936e357ab 100644 --- a/src/gui/widgets/progressindicator.cpp +++ b/src/gui/widgets/progressindicator.cpp @@ -21,11 +21,8 @@ #include "gui/widgets/progressindicator.h" -#include "graphics.h" #include "simpleanimation.h" -#include "gui/theme.h" - #include "resources/animation.h" #include "resources/imageset.h" #include "resources/resourcemanager.h" diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp index 062c426d3..98e1182e1 100644 --- a/src/gui/widgets/radiobutton.cpp +++ b/src/gui/widgets/radiobutton.cpp @@ -24,12 +24,9 @@ #include "client.h" #include "configuration.h" -#include "graphics.h" #include "keydata.h" #include "keyevent.h" -#include "gui/theme.h" - #include "resources/image.h" #include <guichan/font.hpp> diff --git a/src/gui/widgets/radiogroup.cpp b/src/gui/widgets/radiogroup.cpp index 3d20b7248..f0009a202 100644 --- a/src/gui/widgets/radiogroup.cpp +++ b/src/gui/widgets/radiogroup.cpp @@ -22,8 +22,6 @@ #include "gui/widgets/radiobutton.h" -#include "logger.h" - #include "debug.h" RadioGroup::RadioGroup(const Widget2 *const widget, diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp index d7042579f..0b7b73e6e 100644 --- a/src/gui/widgets/scrollarea.cpp +++ b/src/gui/widgets/scrollarea.cpp @@ -24,11 +24,7 @@ #include "client.h" #include "configuration.h" -#include "graphics.h" #include "graphicsvertexes.h" -#include "logger.h" - -#include "gui/theme.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 27ec95b7a..437290bbf 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -22,7 +22,6 @@ #include "configuration.h" #include "main.h" -#include "logger.h" #include "sound.h" #include "gui/editdialog.h" diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index 13a2eb822..b9d7e18f4 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -24,11 +24,9 @@ #include "client.h" #include "configuration.h" -#include "graphics.h" #include "shopitem.h" #include "gui/itempopup.h" -#include "gui/theme.h" #include "gui/viewport.h" #include "gui/widgets/shopitems.h" diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h index ac80bf1b1..f4851cf63 100644 --- a/src/gui/widgets/shortcutcontainer.h +++ b/src/gui/widgets/shortcutcontainer.h @@ -24,7 +24,6 @@ #define SHORTCUTCONTAINER_H #include "gui/widgets/tab.h" -#include "gui/widgets/widget2.h" #include <guichan/mouselistener.hpp> #include <guichan/widget.hpp> diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp index 380ece104..4ba57b257 100644 --- a/src/gui/widgets/slider.cpp +++ b/src/gui/widgets/slider.cpp @@ -24,11 +24,8 @@ #include "client.h" #include "configuration.h" -#include "graphics.h" #include "keyevent.h" -#include "gui/theme.h" - #include "resources/image.h" #include "debug.h" diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp index 0df055d7f..c108930d1 100644 --- a/src/gui/widgets/sliderlist.cpp +++ b/src/gui/widgets/sliderlist.cpp @@ -21,7 +21,6 @@ #include "gui/widgets/sliderlist.h" #include "client.h" -#include "logger.h" #include "gui/gui.h" #include "gui/sdlfont.h" diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index 061e12b73..cfc3863eb 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -24,12 +24,10 @@ #include "gui/inventorywindow.h" #include "gui/okdialog.h" -#include "gui/palette.h" #include "gui/shortcutwindow.h" #include "gui/spellpopup.h" #include "gui/viewport.h" #include "gui/textcommandeditor.h" -#include "gui/theme.h" #include "client.h" #include "spellshortcut.h" diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index 18a4489bd..aea8efb37 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -24,12 +24,7 @@ #include "client.h" #include "configuration.h" -#include "graphics.h" #include "graphicsvertexes.h" -#include "logger.h" - -#include "gui/palette.h" -#include "gui/theme.h" #include "gui/widgets/label.h" #include "gui/widgets/tabbedarea.h" diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index d6c73b642..869956744 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -28,8 +28,6 @@ #include "gui/widgets/scrollarea.h" #include "gui/widgets/tab.h" -#include "logger.h" - #include <guichan/widgets/container.hpp> #include "debug.h" diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 81d19777e..e25183885 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -32,8 +32,6 @@ #include "gui/widgets/button.h" -#include "utils/stringvector.h" - class Tab; /** diff --git a/src/gui/widgets/tabstrip.cpp b/src/gui/widgets/tabstrip.cpp index aa8f3d91f..5e8baf3f5 100644 --- a/src/gui/widgets/tabstrip.cpp +++ b/src/gui/widgets/tabstrip.cpp @@ -23,8 +23,6 @@ #include "gui/widgets/button.h" #include "gui/widgets/tab.h" -#include "logger.h" - #include "debug.h" TabStrip::TabStrip(const Widget2 *const widget, diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index 4f90a6841..51933708b 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -25,8 +25,6 @@ #include "keydata.h" #include "keyevent.h" -#include "gui/theme.h" - #include <guichan/font.hpp> #include <sstream> diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index e8a57067b..d9e585d3c 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -24,13 +24,9 @@ #include "client.h" #include "configuration.h" -#include "graphics.h" #include "keyevent.h" -#include "logger.h" -#include "gui/palette.h" #include "gui/sdlinput.h" -#include "gui/theme.h" #include "resources/image.h" diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tradetab.cpp index 8ead199a3..78d076e12 100644 --- a/src/gui/widgets/tradetab.cpp +++ b/src/gui/widgets/tradetab.cpp @@ -26,8 +26,6 @@ #include "commandhandler.h" #include "localplayer.h" -#include "gui/theme.h" - #include "net/net.h" #include "resources/iteminfo.h" diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp index 0e5d3bfcd..6079b668c 100644 --- a/src/gui/widgets/whispertab.cpp +++ b/src/gui/widgets/whispertab.cpp @@ -26,8 +26,6 @@ #include "commandhandler.h" #include "localplayer.h" -#include "gui/theme.h" - #include "net/chathandler.h" #include "net/net.h" diff --git a/src/gui/widgets/widgetgroup.cpp b/src/gui/widgets/widgetgroup.cpp index 2861fa6fc..85d28dc1b 100644 --- a/src/gui/widgets/widgetgroup.cpp +++ b/src/gui/widgets/widgetgroup.cpp @@ -20,8 +20,6 @@ #include "gui/widgets/widgetgroup.h" -#include "logger.h" - #include "debug.h" WidgetGroup::WidgetGroup(const Widget2 *const widget, diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 5495cd310..3f54ce3cc 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -25,12 +25,9 @@ #include "client.h" #include "configuration.h" #include "graphicsvertexes.h" -#include "logger.h" #include "sound.h" #include "gui/gui.h" -#include "gui/palette.h" -#include "gui/theme.h" #include "gui/viewport.h" #include "gui/widgets/layout.h" |