From bd17bd98bb85bc146958fed07f48dcea55a969a5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 31 May 2011 02:00:49 +0300 Subject: Revert "Switch includes to use embedded guichan." This reverts commit 338c3b1cae626830c9b9d231aeb9f9e8034b37d1. --- src/gui/widgets/avatarlistbox.cpp | 2 +- src/gui/widgets/browserbox.cpp | 6 +++--- src/gui/widgets/browserbox.h | 4 ++-- src/gui/widgets/button.cpp | 4 ++-- src/gui/widgets/button.h | 6 +++--- src/gui/widgets/chattab.cpp | 2 +- src/gui/widgets/checkbox.cpp | 2 +- src/gui/widgets/checkbox.h | 2 +- src/gui/widgets/container.h | 4 ++-- src/gui/widgets/desktop.h | 2 +- src/gui/widgets/dropdown.h | 2 +- src/gui/widgets/dropshortcutcontainer.h | 2 +- src/gui/widgets/flowcontainer.h | 2 +- src/gui/widgets/horizontcontainer.h | 2 +- src/gui/widgets/icon.h | 2 +- src/gui/widgets/inventoryfilter.h | 4 ++-- src/gui/widgets/itemcontainer.cpp | 4 ++-- src/gui/widgets/itemcontainer.h | 8 ++++---- src/gui/widgets/itemshortcutcontainer.h | 2 +- src/gui/widgets/label.h | 2 +- src/gui/widgets/layout.h | 2 +- src/gui/widgets/layouthelper.h | 2 +- src/gui/widgets/linkhandler.h | 2 +- src/gui/widgets/listbox.cpp | 8 ++++---- src/gui/widgets/listbox.h | 2 +- src/gui/widgets/mouseevent.h | 4 ++-- src/gui/widgets/playerbox.h | 2 +- src/gui/widgets/popup.cpp | 2 +- src/gui/widgets/popup.h | 4 ++-- src/gui/widgets/progressbar.cpp | 2 +- src/gui/widgets/progressbar.h | 4 ++-- src/gui/widgets/progressindicator.cpp | 2 +- src/gui/widgets/progressindicator.h | 2 +- src/gui/widgets/radiobutton.h | 2 +- src/gui/widgets/resizegrip.cpp | 2 +- src/gui/widgets/resizegrip.h | 2 +- src/gui/widgets/scrollarea.h | 4 ++-- src/gui/widgets/shopitems.h | 2 +- src/gui/widgets/shoplistbox.cpp | 4 ++-- src/gui/widgets/shortcutcontainer.h | 6 +++--- src/gui/widgets/slider.h | 2 +- src/gui/widgets/spellshortcutcontainer.h | 2 +- src/gui/widgets/tab.cpp | 2 +- src/gui/widgets/tab.h | 4 ++-- src/gui/widgets/tabbedarea.cpp | 2 +- src/gui/widgets/tabbedarea.h | 8 ++++---- src/gui/widgets/table.cpp | 6 +++--- src/gui/widgets/table.h | 6 +++--- src/gui/widgets/tablemodel.cpp | 2 +- src/gui/widgets/tablemodel.h | 2 +- src/gui/widgets/textbox.cpp | 2 +- src/gui/widgets/textbox.h | 2 +- src/gui/widgets/textfield.cpp | 2 +- src/gui/widgets/textfield.h | 2 +- src/gui/widgets/textpreview.h | 6 +++--- src/gui/widgets/vertcontainer.h | 2 +- src/gui/widgets/window.cpp | 4 ++-- src/gui/widgets/window.h | 4 ++-- 58 files changed, 92 insertions(+), 92 deletions(-) (limited to 'src/gui/widgets') diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index f9a334bbd..c4737160b 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -38,7 +38,7 @@ #include "utils/stringutils.h" -#include "guichan/font.hpp" +#include #include "debug.h" diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 2cc118a99..f3ee7270b 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -38,9 +38,9 @@ #include "resources/resource.h" #include "resources/resourcemanager.h" -#include "guichan/graphics.hpp" -#include "guichan/font.hpp" -#include "guichan/cliprectangle.hpp" +#include +#include +#include #include diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h index ae9e6aec9..258e0bd09 100644 --- a/src/gui/widgets/browserbox.h +++ b/src/gui/widgets/browserbox.h @@ -24,8 +24,8 @@ #ifndef BROWSERBOX_H #define BROWSERBOX_H -#include "guichan/mouselistener.hpp" -#include "guichan/widget.hpp" +#include +#include #include #include diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index ba272f032..ba3ac5f36 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -35,8 +35,8 @@ #include "utils/dtor.h" -#include "guichan/exception.hpp" -#include "guichan/font.hpp" +#include +#include #include "debug.h" diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h index a0c920bef..8c43b6ddd 100644 --- a/src/gui/widgets/button.h +++ b/src/gui/widgets/button.h @@ -23,9 +23,9 @@ #ifndef BUTTON_H #define BUTTON_H -#include "guichan/widgets/button.hpp" -#include "guichan/mouseevent.hpp" -#include "guichan/widgetlistener.hpp" +#include +#include +#include class GraphicsVertexes; class ImageRect; diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 76ae40ac0..76f74dec8 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -44,7 +44,7 @@ #include "utils/gettext.h" #include "utils/stringutils.h" -#include "guichan/widgets/tabbedarea.hpp" +#include #include "debug.h" diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp index f1057f0b6..0422345f7 100644 --- a/src/gui/widgets/checkbox.cpp +++ b/src/gui/widgets/checkbox.cpp @@ -31,7 +31,7 @@ #include "resources/image.h" -#include "guichan/actionlistener.hpp" +#include #include "debug.h" diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h index 93ec3cda8..a8324e2fa 100644 --- a/src/gui/widgets/checkbox.h +++ b/src/gui/widgets/checkbox.h @@ -23,7 +23,7 @@ #ifndef CHECKBOX_H #define CHECKBOX_H -#include "guichan/widgets/checkbox.hpp" +#include #ifdef __GNUC__ #define _UNUSED_ __attribute__ ((unused)) diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h index 4fa808b9b..1d8872477 100644 --- a/src/gui/widgets/container.h +++ b/src/gui/widgets/container.h @@ -23,8 +23,8 @@ #ifndef GUI_CONTAINER_H #define GUI_CONTAINER_H -#include "guichan/widget.hpp" -#include "guichan/widgets/container.hpp" +#include +#include /** * A widget container. diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h index 400d550f1..7666b9e22 100644 --- a/src/gui/widgets/desktop.h +++ b/src/gui/widgets/desktop.h @@ -25,7 +25,7 @@ #include "gui/widgets/container.h" -#include "guichan/widgetlistener.hpp" +#include #ifdef __GNUC__ #define _UNUSED_ __attribute__ ((unused)) diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index 177b629e0..d85c3166c 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -23,7 +23,7 @@ #ifndef DROPDOWN_H #define DROPDOWN_H -#include "guichan/widgets/dropdown.hpp" +#include class Image; class ImageRect; diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h index 395cb4b9b..c072f0613 100644 --- a/src/gui/widgets/dropshortcutcontainer.h +++ b/src/gui/widgets/dropshortcutcontainer.h @@ -23,7 +23,7 @@ #ifndef DROPSHORTCUTCONTAINER_H #define DROPSHORTCUTCONTAINER_H -#include "guichan/mouselistener.hpp" +#include #include "gui/widgets/shortcutcontainer.h" diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h index 5098df296..6d2a716ef 100644 --- a/src/gui/widgets/flowcontainer.h +++ b/src/gui/widgets/flowcontainer.h @@ -24,7 +24,7 @@ #include "container.h" -#include "guichan/widgetlistener.hpp" +#include #ifdef __GNUC__ #define _UNUSED_ __attribute__ ((unused)) diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h index c07c9a128..99d05b11c 100644 --- a/src/gui/widgets/horizontcontainer.h +++ b/src/gui/widgets/horizontcontainer.h @@ -24,7 +24,7 @@ #include "gui/widgets/container.h" -#include "guichan/widgetlistener.hpp" +#include #ifdef __GNUC__ #define _UNUSED_ __attribute__ ((unused)) diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h index 4aea36825..4b0d12342 100644 --- a/src/gui/widgets/icon.h +++ b/src/gui/widgets/icon.h @@ -23,7 +23,7 @@ #ifndef ICON_H #define ICON_H -#include "guichan/widget.hpp" +#include class Image; diff --git a/src/gui/widgets/inventoryfilter.h b/src/gui/widgets/inventoryfilter.h index 0ca18af97..ed49ba39b 100644 --- a/src/gui/widgets/inventoryfilter.h +++ b/src/gui/widgets/inventoryfilter.h @@ -22,8 +22,8 @@ #ifndef GUI_INVENTORYFILTER_H #define GUI_INVENTORYFILTER_H -#include "guichan/actionlistener.hpp" -#include "guichan/widgetlistener.hpp" +#include +#include #include "gui/widgets/horizontcontainer.h" diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index d3d2a9ba9..d4cecced2 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -47,8 +47,8 @@ #include "utils/stringutils.h" -#include "guichan/mouseinput.hpp" -#include "guichan/selectionlistener.hpp" +#include +#include #include "debug.h" diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index 9bd138291..05988b742 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -23,10 +23,10 @@ #ifndef ITEMCONTAINER_H #define ITEMCONTAINER_H -#include "guichan/keylistener.hpp" -#include "guichan/mouselistener.hpp" -#include "guichan/widget.hpp" -#include "guichan/widgetlistener.hpp" +#include +#include +#include +#include #include #include diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h index fc7194b4e..bd3df56e5 100644 --- a/src/gui/widgets/itemshortcutcontainer.h +++ b/src/gui/widgets/itemshortcutcontainer.h @@ -27,7 +27,7 @@ #include "gui/widgets/shortcutcontainer.h" -#include "guichan/mouselistener.hpp" +#include #ifdef __GNUC__ #define _UNUSED_ __attribute__ ((unused)) diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h index 0b9a194b6..775eda18c 100644 --- a/src/gui/widgets/label.h +++ b/src/gui/widgets/label.h @@ -21,7 +21,7 @@ #ifndef LABEL_H #define LABEL_H -#include "guichan/widgets/label.hpp" +#include /** * Label widget. Same as the Guichan label but modified to use the palette diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h index 313a940ac..f5e1f1749 100644 --- a/src/gui/widgets/layout.h +++ b/src/gui/widgets/layout.h @@ -23,7 +23,7 @@ #ifndef WIDGET_LAYOUT_H #define WIDGET_LAYOUT_H -#include "guichan/widgets/container.hpp" +#include #include diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h index 533b9d14d..f4f0d25c9 100644 --- a/src/gui/widgets/layouthelper.h +++ b/src/gui/widgets/layouthelper.h @@ -25,7 +25,7 @@ #include "gui/widgets/layout.h" -#include "guichan/widgetlistener.hpp" +#include #ifdef __GNUC__ #define _UNUSED_ __attribute__ ((unused)) diff --git a/src/gui/widgets/linkhandler.h b/src/gui/widgets/linkhandler.h index ce5d73a87..f8f195f2d 100644 --- a/src/gui/widgets/linkhandler.h +++ b/src/gui/widgets/linkhandler.h @@ -25,7 +25,7 @@ #include -#include "guichan/mouselistener.hpp" +#include /** * A simple interface to windows that need to handle links from BrowserBox diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp index e2479ea1d..ae75d469e 100644 --- a/src/gui/widgets/listbox.cpp +++ b/src/gui/widgets/listbox.cpp @@ -29,10 +29,10 @@ #include "gui/sdlinput.h" #include "gui/theme.h" -#include "guichan/font.hpp" -#include "guichan/graphics.hpp" -#include "guichan/key.hpp" -#include "guichan/listmodel.hpp" +#include +#include +#include +#include #include "debug.h" diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h index 8ffba15d9..7a372e7e2 100644 --- a/src/gui/widgets/listbox.h +++ b/src/gui/widgets/listbox.h @@ -23,7 +23,7 @@ #ifndef LISTBOX_H #define LISTBOX_H -#include "guichan/widgets/listbox.hpp" +#include #ifdef __GNUC__ #define _UNUSED_ __attribute__ ((unused)) diff --git a/src/gui/widgets/mouseevent.h b/src/gui/widgets/mouseevent.h index b5bf53188..5e9a46cfd 100644 --- a/src/gui/widgets/mouseevent.h +++ b/src/gui/widgets/mouseevent.h @@ -22,8 +22,8 @@ #ifndef GUI_MOUSEEVENT_H #define GUI_MOUSEEVENT_H -#include "guichan/mouseevent.hpp" -#include "guichan/widget.hpp" +#include +#include class MouseEvent : public gcn::MouseEvent { diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h index 6e1b8d07e..1b1a237d8 100644 --- a/src/gui/widgets/playerbox.h +++ b/src/gui/widgets/playerbox.h @@ -23,7 +23,7 @@ #ifndef PLAYERBOX_H #define PLAYERBOX_H -#include "guichan/widgets/scrollarea.hpp" +#include class Being; class ImageRect; diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 6b6f7023b..444d147ff 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -36,7 +36,7 @@ #include "resources/image.h" -#include "guichan/exception.hpp" +#include #include "debug.h" diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h index 81a111a6a..963477fbb 100644 --- a/src/gui/widgets/popup.h +++ b/src/gui/widgets/popup.h @@ -29,8 +29,8 @@ #include "gui/widgets/container.h" -#include "guichan/mouselistener.hpp" -#include "guichan/widgetlistener.hpp" +#include +#include #ifdef __GNUC__ #define _UNUSED_ __attribute__ ((unused)) diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index 065e8fb88..363bab319 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -36,7 +36,7 @@ #include "utils/dtor.h" -#include "guichan/font.hpp" +#include #include "debug.h" diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h index 2f5816dce..52a26ddac 100644 --- a/src/gui/widgets/progressbar.h +++ b/src/gui/widgets/progressbar.h @@ -23,11 +23,11 @@ #ifndef PROGRESSBAR_H #define PROGRESSBAR_H -#include "guichan/widget.hpp" +#include #include -#include "guichan/widgetlistener.hpp" +#include class Graphics; class GraphicsVertexes; diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp index 46cfb4cc3..e885aa0ec 100644 --- a/src/gui/widgets/progressindicator.cpp +++ b/src/gui/widgets/progressindicator.cpp @@ -30,7 +30,7 @@ #include "resources/imageset.h" #include "resources/resourcemanager.h" -#include "guichan/widgets/label.hpp" +#include #include "debug.h" diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h index 46dd2bcc2..e5fcaefda 100644 --- a/src/gui/widgets/progressindicator.h +++ b/src/gui/widgets/progressindicator.h @@ -22,7 +22,7 @@ #ifndef PROGRESSINDICATOR_H #define PROGRESSINDICATOR_H -#include "guichan/widget.hpp" +#include class SimpleAnimation; diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h index eeb5546f7..32a06c97d 100644 --- a/src/gui/widgets/radiobutton.h +++ b/src/gui/widgets/radiobutton.h @@ -23,7 +23,7 @@ #ifndef RADIOBUTTON_H #define RADIOBUTTON_H -#include "guichan/widgets/radiobutton.hpp" +#include #ifdef __GNUC__ #define _UNUSED_ __attribute__ ((unused)) diff --git a/src/gui/widgets/resizegrip.cpp b/src/gui/widgets/resizegrip.cpp index 60f001ce9..cf017b9ec 100644 --- a/src/gui/widgets/resizegrip.cpp +++ b/src/gui/widgets/resizegrip.cpp @@ -30,7 +30,7 @@ #include "resources/image.h" -#include "guichan/graphics.hpp" +#include #include "debug.h" diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h index b64378052..873d74058 100644 --- a/src/gui/widgets/resizegrip.h +++ b/src/gui/widgets/resizegrip.h @@ -23,7 +23,7 @@ #ifndef RESIZEGRIP_H #define RESIZEGRIP_H -#include "guichan/widget.hpp" +#include class Image; diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h index 40ee4c5e4..0e5a8f850 100644 --- a/src/gui/widgets/scrollarea.h +++ b/src/gui/widgets/scrollarea.h @@ -23,8 +23,8 @@ #ifndef SCROLLAREA_H #define SCROLLAREA_H -#include "guichan/widgets/scrollarea.hpp" -#include "guichan/widgetlistener.hpp" +#include +#include #ifdef __GNUC__ #define _UNUSED_ __attribute__ ((unused)) diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h index 89297976b..cc444fe85 100644 --- a/src/gui/widgets/shopitems.h +++ b/src/gui/widgets/shopitems.h @@ -23,7 +23,7 @@ #ifndef SHOPITEMS_H #define SHOPITEMS_H -#include "guichan/listmodel.hpp" +#include #include #include diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index 5f11fb210..81a3b7b58 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -35,8 +35,8 @@ #include "resources/image.h" -#include "guichan/font.hpp" -#include "guichan/listmodel.hpp" +#include +#include #include "debug.h" diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h index 1e7684159..42454fe2b 100644 --- a/src/gui/widgets/shortcutcontainer.h +++ b/src/gui/widgets/shortcutcontainer.h @@ -23,9 +23,9 @@ #ifndef SHORTCUTCONTAINER_H #define SHORTCUTCONTAINER_H -#include "guichan/mouselistener.hpp" -#include "guichan/widget.hpp" -#include "guichan/widgetlistener.hpp" +#include +#include +#include #include "gui/widgets/tab.h" diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h index a5d739924..bcc5de3c7 100644 --- a/src/gui/widgets/slider.h +++ b/src/gui/widgets/slider.h @@ -23,7 +23,7 @@ #ifndef SLIDER_H #define SLIDER_H -#include "guichan/widgets/slider.hpp" +#include #ifdef __GNUC__ #define _UNUSED_ __attribute__ ((unused)) diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h index 1056e26bf..a4ad1576a 100644 --- a/src/gui/widgets/spellshortcutcontainer.h +++ b/src/gui/widgets/spellshortcutcontainer.h @@ -23,7 +23,7 @@ #ifndef SPELLSHORTCUTCONTAINER_H #define SPELLSHORTCUTCONTAINER_H -#include "guichan/mouselistener.hpp" +#include #include "gui/widgets/shortcutcontainer.h" //#include "textcommand.h" diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index d1c62753a..7287d6a8e 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -37,7 +37,7 @@ #include "utils/dtor.h" -#include "guichan/widgets/label.hpp" +#include #include "debug.h" diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h index 9da954a81..f9f1fa4da 100644 --- a/src/gui/widgets/tab.h +++ b/src/gui/widgets/tab.h @@ -23,8 +23,8 @@ #ifndef TAB_H #define TAB_H -#include "guichan/widgets/tab.hpp" -#include "guichan/widgetlistener.hpp" +#include +#include class GraphicsVertexes; class ImageRect; diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index 214674605..b20237c1b 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -27,7 +27,7 @@ #include "log.h" -#include "guichan/widgets/container.hpp" +#include #include "debug.h" diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 5ea72feda..d6f0783df 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -23,10 +23,10 @@ #ifndef TABBEDAREA_H #define TABBEDAREA_H -#include "guichan/widget.hpp" -#include "guichan/widgetlistener.hpp" -#include "guichan/widgets/container.hpp" -#include "guichan/widgets/tabbedarea.hpp" +#include +#include +#include +#include #include "gui/widgets/button.h" diff --git a/src/gui/widgets/table.cpp b/src/gui/widgets/table.cpp index 3b8a425bb..d5325679f 100644 --- a/src/gui/widgets/table.cpp +++ b/src/gui/widgets/table.cpp @@ -30,9 +30,9 @@ #include "utils/dtor.h" -#include "guichan/actionlistener.hpp" -#include "guichan/graphics.hpp" -#include "guichan/key.hpp" +#include +#include +#include #include "debug.h" diff --git a/src/gui/widgets/table.h b/src/gui/widgets/table.h index c26ed6f06..48075d53a 100644 --- a/src/gui/widgets/table.h +++ b/src/gui/widgets/table.h @@ -25,9 +25,9 @@ #include "gui/widgets/tablemodel.h" -#include "guichan/keylistener.hpp" -#include "guichan/mouselistener.hpp" -#include "guichan/widget.hpp" +#include +#include +#include #include diff --git a/src/gui/widgets/tablemodel.cpp b/src/gui/widgets/tablemodel.cpp index d4393f4a7..6c932a411 100644 --- a/src/gui/widgets/tablemodel.cpp +++ b/src/gui/widgets/tablemodel.cpp @@ -24,7 +24,7 @@ #include "utils/dtor.h" -#include "guichan/widget.hpp" +#include #include "debug.h" diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h index a6829addc..810b2f4ac 100644 --- a/src/gui/widgets/tablemodel.h +++ b/src/gui/widgets/tablemodel.h @@ -23,7 +23,7 @@ #ifndef TABLE_MODEL_H #define TABLE_MODEL_H -#include "guichanfwd.h" +#include #include #include diff --git a/src/gui/widgets/textbox.cpp b/src/gui/widgets/textbox.cpp index 44ac62be6..f31c8d129 100644 --- a/src/gui/widgets/textbox.cpp +++ b/src/gui/widgets/textbox.cpp @@ -24,7 +24,7 @@ #include "gui/theme.h" -#include "guichan/font.hpp" +#include #include diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h index 02f27e23b..27525fc85 100644 --- a/src/gui/widgets/textbox.h +++ b/src/gui/widgets/textbox.h @@ -23,7 +23,7 @@ #ifndef TEXTBOX_H #define TEXTBOX_H -#include "guichan/widgets/textbox.hpp" +#include /** * A text box, meant to be used inside a scroll area. Same as the Guichan text diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index f02a4e3a8..fd50ee4d5 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -36,7 +36,7 @@ #include "utils/copynpaste.h" #include "utils/dtor.h" -#include "guichan/font.hpp" +#include #undef DELETE //Win32 compatibility hack diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h index 4f4c13443..79197bb7a 100644 --- a/src/gui/widgets/textfield.h +++ b/src/gui/widgets/textfield.h @@ -23,7 +23,7 @@ #ifndef TEXTFIELD_H #define TEXTFIELD_H -#include "guichan/widgets/textfield.hpp" +#include class ImageRect; class TextField; diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h index a17c8e15d..a3f623177 100644 --- a/src/gui/widgets/textpreview.h +++ b/src/gui/widgets/textpreview.h @@ -23,9 +23,9 @@ #ifndef TEXTPREVIEW_H #define TEXTPREVIEW_H -#include "guichan/color.hpp" -#include "guichan/font.hpp" -#include "guichan/widget.hpp" +#include +#include +#include /** * Preview widget for particle colors, etc. diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h index 3e6a6b751..e96bd5561 100644 --- a/src/gui/widgets/vertcontainer.h +++ b/src/gui/widgets/vertcontainer.h @@ -24,7 +24,7 @@ #include "gui/widgets/container.h" -#include "guichan/widgetlistener.hpp" +#include #ifdef __GNUC__ #define _UNUSED_ __attribute__ ((unused)) diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index fccab9e99..2b6c4ef58 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -38,8 +38,8 @@ #include "resources/image.h" -#include "guichan/exception.hpp" -#include "guichan/focushandler.hpp" +#include +#include #include "debug.h" diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index ad82c5772..f455f1238 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -26,9 +26,9 @@ #include "graphics.h" #include "guichanfwd.h" -#include "guichan/widgetlistener.hpp" +#include -#include "guichan/widgets/window.hpp" +#include #ifdef __GNUC__ #define _UNUSED_ __attribute__ ((unused)) -- cgit v1.2.3-60-g2f50