diff options
Diffstat (limited to 'src/gui/widgets')
24 files changed, 6 insertions, 54 deletions
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 0b41cad40..a508897d3 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -40,7 +40,6 @@ #include "gui/windows/chatwindow.h" -#include "resources/image.h" #include "resources/mapitemtype.h" #include "resources/map/map.h" diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 1657968df..4862e07a3 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -45,10 +45,6 @@ #include "utils/timer.h" #include "utils/translation/podict.h" -#include "gui/cliprect.h" - -#include "render/graphics.h" - #include <algorithm> #include "debug.h" diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index f228df029..39b09ae0b 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -76,7 +76,6 @@ #include "gui/gui.h" #include "gui/skin.h" -#include "gui/rect.h" #include "gui/fonts/font.h" diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index 3f79d1531..291c77852 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -22,7 +22,6 @@ #include "gui/widgets/desktop.h" #include "configuration.h" -#include "main.h" #include "gui/skin.h" diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index b9d6f096c..3977931b6 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -35,11 +35,8 @@ #include "gui/widgets/popuplist.h" -#include "resources/image.h" #include "resources/imagerect.h" -#include <algorithm> - #include "debug.h" int DropDown::instances = 0; diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp index b9a9abf32..41400c1a6 100644 --- a/src/gui/widgets/extendedlistbox.cpp +++ b/src/gui/widgets/extendedlistbox.cpp @@ -26,10 +26,6 @@ #include "gui/fonts/font.h" -#include "gui/models/listmodel.h" - -#include "render/graphics.h" - #include "debug.h" ExtendedListBox::ExtendedListBox(const Widget2 *const widget, diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 0bb8c50f3..9728c0e7f 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -23,8 +23,6 @@ #include "gui/widgets/itemcontainer.h" #include "dragdrop.h" -#include "inventory.h" -#include "item.h" #include "itemshortcut.h" #include "being/playerinfo.h" @@ -47,11 +45,8 @@ #include "utils/gettext.h" #include "utils/stringutils.h" -#include "resources/image.h" #include "resources/iteminfo.h" -#include "listeners/selectionlistener.h" - #include <algorithm> #include "debug.h" diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index 19088782b..4cb998c69 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -37,8 +37,6 @@ #include "listeners/openurllistener.h" -#include <string> - #include "debug.h" namespace diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index c11a83f8c..775062ce1 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -23,8 +23,6 @@ #include "gui/widgets/itemshortcutcontainer.h" #include "dragdrop.h" -#include "inventory.h" -#include "item.h" #include "itemshortcut.h" #include "settings.h" #include "spellshortcut.h" @@ -44,9 +42,6 @@ #include "gui/windows/inventorywindow.h" #include "gui/windows/skilldialog.h" -#include "gui/widgets/skillinfo.h" - -#include "resources/image.h" #include "resources/skillconsts.h" #include "utils/stringutils.h" diff --git a/src/gui/widgets/layoutarray.cpp b/src/gui/widgets/layoutarray.cpp index 92af206fb..f025769e8 100644 --- a/src/gui/widgets/layoutarray.cpp +++ b/src/gui/widgets/layoutarray.cpp @@ -22,8 +22,6 @@ #include "gui/widgets/layoutarray.h" -#include "logger.h" - #include "gui/widgets/layoutcell.h" #include "gui/widgets/layouttype.h" #include "gui/widgets/widget.h" diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp index 4775e266f..2d07460c4 100644 --- a/src/gui/widgets/playerbox.cpp +++ b/src/gui/widgets/playerbox.cpp @@ -29,8 +29,6 @@ #include "gui/gui.h" #include "gui/skin.h" -#include "resources/image.h" - #include "debug.h" PlayerBox::PlayerBox(Widget2 *const widget, diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index ff1370c0b..98dadd046 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -21,7 +21,6 @@ #include "gui/widgets/setupitem.h" #include "configuration.h" -#include "main.h" #include "soundmanager.h" #include "gui/gui.h" diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index 97ace4181..b4799a218 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -38,8 +38,6 @@ #include "resources/image.h" -#include "gui/models/listmodel.h" - #include "debug.h" const int ITEM_ICON_SIZE = 32; diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index 211dd6b4e..a22cb7f6e 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -36,8 +36,6 @@ #include "gui/windows/shortcutwindow.h" -#include "resources/image.h" - #include "debug.h" SpellShortcutContainer::SpellShortcutContainer(Widget2 *const widget, diff --git a/src/gui/widgets/tabs/chat/guildtab.cpp b/src/gui/widgets/tabs/chat/guildtab.cpp index 341513852..0b220594a 100644 --- a/src/gui/widgets/tabs/chat/guildtab.cpp +++ b/src/gui/widgets/tabs/chat/guildtab.cpp @@ -23,7 +23,6 @@ #include "gui/widgets/tabs/chat/guildtab.h" #include "configuration.h" -#include "guild.h" #include "soundconsts.h" #include "soundmanager.h" diff --git a/src/gui/widgets/tabs/debugwindowtabs.cpp b/src/gui/widgets/tabs/debugwindowtabs.cpp index 7c5adcd66..faccf9b2e 100644 --- a/src/gui/widgets/tabs/debugwindowtabs.cpp +++ b/src/gui/widgets/tabs/debugwindowtabs.cpp @@ -32,10 +32,11 @@ #include "gui/widgets/containerplacer.h" #include "gui/widgets/label.h" -#include "gui/widgets/layoutcell.h" #include "gui/widgets/layouthelper.h" +#ifdef USE_OPENGL #include "resources/imagehelper.h" +#endif #include "resources/map/map.h" diff --git a/src/gui/widgets/tabs/setup_audio.cpp b/src/gui/widgets/tabs/setup_audio.cpp index cf278b76e..e913f611c 100644 --- a/src/gui/widgets/tabs/setup_audio.cpp +++ b/src/gui/widgets/tabs/setup_audio.cpp @@ -22,8 +22,6 @@ #include "gui/widgets/tabs/setup_audio.h" -#include "main.h" - #include "resources/map/map.h" #include "configuration.h" diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp index b93cf3ed5..28d52db0b 100644 --- a/src/gui/widgets/tabs/setup_colors.cpp +++ b/src/gui/widgets/tabs/setup_colors.cpp @@ -40,7 +40,6 @@ #include "utils/gettext.h" #include "utils/stringutils.h" -#include <string> #include <cmath> #include "debug.h" diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp index 47d985a3e..de4990e5c 100644 --- a/src/gui/widgets/tabs/setup_theme.cpp +++ b/src/gui/widgets/tabs/setup_theme.cpp @@ -43,7 +43,6 @@ #include "configuration.h" #include "utils/delete2.h" -#include "utils/gettext.h" #include "debug.h" diff --git a/src/gui/widgets/tabs/setup_touch.cpp b/src/gui/widgets/tabs/setup_touch.cpp index bd0f17411..0a0b97728 100644 --- a/src/gui/widgets/tabs/setup_touch.cpp +++ b/src/gui/widgets/tabs/setup_touch.cpp @@ -20,7 +20,6 @@ #include "gui/widgets/tabs/setup_touch.h" -#include "gui/models/namesmodel.h" #include "gui/models/touchactionmodel.h" #include "gui/widgets/containerplacer.h" diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index 696927b6b..3f88316c8 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -24,8 +24,6 @@ #include "configuration.h" -#include "graphicsmanager.h" - #include "enums/gui/dialogtype.h" #include "gui/windowmanager.h" @@ -43,12 +41,13 @@ #include "gui/widgets/slider.h" #include "gui/widgets/dropdown.h" -#include "render/rendererslistsdl.h" - #include "utils/delete2.h" -#include "utils/gettext.h" + +#if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__APPLE__) +#include "graphicsmanager.h" #include "test/testmain.h" +#endif #include "gui/models/modelistmodel.h" #include "gui/models/opengllistmodel.h" diff --git a/src/gui/widgets/virtshortcutcontainer.cpp b/src/gui/widgets/virtshortcutcontainer.cpp index b735f962e..4b03d8890 100644 --- a/src/gui/widgets/virtshortcutcontainer.cpp +++ b/src/gui/widgets/virtshortcutcontainer.cpp @@ -37,8 +37,6 @@ #include "gui/windows/inventorywindow.h" -#include "resources/image.h" - #include "utils/stringutils.h" #include "debug.h" diff --git a/src/gui/widgets/widget.cpp b/src/gui/widgets/widget.cpp index 7079f054f..667f88655 100644 --- a/src/gui/widgets/widget.cpp +++ b/src/gui/widgets/widget.cpp @@ -67,8 +67,6 @@ #include "gui/widgets/widget.h" -#include "events/actionevent.h" - #include "gui/focushandler.h" #include "listeners/actionlistener.h" diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index d16ce9853..82cd77a0d 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -87,9 +87,6 @@ #include "gui/widgets/containerplacer.h" #include "gui/widgets/layout.h" -#include "resources/cursor.h" -#include "resources/image.h" - #include "utils/delete2.h" #include "debug.h" |