diff options
59 files changed, 256 insertions, 157 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 35133e389..3a6fa7f87 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -528,7 +528,6 @@ SET(SRCS graphicsmanager.h graphicsvertexes.cpp graphicsvertexes.h - guichanfwd.h guild.cpp guild.h guildmanager.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 123a589fe..c36d972d4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -544,7 +544,6 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ graphicsmanager.h \ graphicsvertexes.cpp \ graphicsvertexes.h \ - guichanfwd.h \ guild.cpp \ guild.h \ guildmanager.cpp \ diff --git a/src/gui/botcheckerwindow.h b/src/gui/botcheckerwindow.h index dfae55627..f2a284733 100644 --- a/src/gui/botcheckerwindow.h +++ b/src/gui/botcheckerwindow.h @@ -42,6 +42,11 @@ class ScrollArea; class UsersTableModel; class StaticTableModel; +namespace gcn +{ + class Button; +} + class BotCheckerWindow : public Window, public gcn::ActionListener, public ConfigListener { diff --git a/src/gui/buydialog.h b/src/gui/buydialog.h index 57f66c922..ea449e06e 100644 --- a/src/gui/buydialog.h +++ b/src/gui/buydialog.h @@ -23,8 +23,6 @@ #ifndef BUYDIALOG_H #define BUYDIALOG_H -#include "guichanfwd.h" - #include "gui/widgets/window.h" #include <guichan/actionlistener.hpp> @@ -35,6 +33,14 @@ class ShopListBox; class IntTextField; class ListBox; +namespace gcn +{ + class Button; + class Label; + class ScrollArea; + class Slider; +} + /** * The buy dialog. * diff --git a/src/gui/buyselldialog.h b/src/gui/buyselldialog.h index d8e4444d8..9636f4e0a 100644 --- a/src/gui/buyselldialog.h +++ b/src/gui/buyselldialog.h @@ -27,6 +27,11 @@ #include <guichan/actionlistener.hpp> +namespace gcn +{ + class Button; +} + /** * A dialog to choose between buying or selling at a shop. * diff --git a/src/gui/changeemaildialog.h b/src/gui/changeemaildialog.h index acbd6b55a..cbf8f782f 100644 --- a/src/gui/changeemaildialog.h +++ b/src/gui/changeemaildialog.h @@ -23,8 +23,6 @@ #ifndef GUI_CHANGEEMAIL_H #define GUI_CHANGEEMAIL_H -#include "guichanfwd.h" - #include "gui/widgets/window.h" #include <guichan/actionlistener.hpp> @@ -33,6 +31,12 @@ class LoginData; class OkDialog; class WrongDataNoticeListener; +namespace gcn +{ + class Button; + class TextField; +} + /** * The Change email dialog. * diff --git a/src/gui/changepassworddialog.h b/src/gui/changepassworddialog.h index 525384a09..a548638a4 100644 --- a/src/gui/changepassworddialog.h +++ b/src/gui/changepassworddialog.h @@ -23,8 +23,6 @@ #ifndef CHANGEPASSWORDDIALOG_H #define CHANGEPASSWORDDIALOG_H -#include "guichanfwd.h" - #include "gui/widgets/window.h" #include <guichan/actionlistener.hpp> @@ -33,6 +31,12 @@ class LoginData; class OkDialog; class WrongDataNoticeListener; +namespace gcn +{ + class Button; + class TextField; +} + /** * The Change password dialog. * diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h index 408297adc..b67a3971b 100644 --- a/src/gui/charcreatedialog.h +++ b/src/gui/charcreatedialog.h @@ -24,7 +24,6 @@ #define CHAR_CREATE_DIALOG_H #include "being.h" -#include "guichanfwd.h" #include "gui/charselectdialog.h" @@ -37,6 +36,13 @@ class LocalPlayer; class PlayerBox; class TextField; +namespace gcn +{ + class Label; + class RadioButton; + class Slider; +} + /** * Character creation dialog. * diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h index fe65f3ce1..fb71b4bf4 100644 --- a/src/gui/charselectdialog.h +++ b/src/gui/charselectdialog.h @@ -24,7 +24,6 @@ #define CHAR_SELECT_H #include "being.h" -#include "guichanfwd.h" #include "main.h" #include "gui/widgets/window.h" @@ -40,6 +39,12 @@ class LoginData; class PlayerBox; class TextDialog; +namespace gcn +{ + class Button; + class Label; +} + namespace Net { class CharHandler; diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h index 336f0cb72..e0ab7bc2d 100644 --- a/src/gui/chatwindow.h +++ b/src/gui/chatwindow.h @@ -51,6 +51,11 @@ class ItemLinkHandler; class Tab; class WhisperTab; +namespace gcn +{ + class DropDown; +} + #define DEFAULT_CHAT_WINDOW_SCROLL 7 // 1 means `1/8th of the window size'. enum Own diff --git a/src/gui/didyouknowwindow.h b/src/gui/didyouknowwindow.h index f3fb61c70..de5064ad3 100644 --- a/src/gui/didyouknowwindow.h +++ b/src/gui/didyouknowwindow.h @@ -33,6 +33,11 @@ class BrowserBox; class CheckBox; class LinkHandler; +namespace gcn +{ + class ScrollArea; +} + /** * The help dialog. */ diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index 1e7b84533..a95e98c13 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -24,7 +24,6 @@ #define EQUIPMENTWINDOW_H #include "equipment.h" -#include "guichanfwd.h" #include "localconsts.h" #include "gui/widgets/window.h" @@ -45,6 +44,11 @@ class Item; class ItemPopup; class PlayerBox; +namespace gcn +{ + class Button; +} + struct EquipmentBox { EquipmentBox(int x0, int y0, Image *img) : diff --git a/src/gui/gui.h b/src/gui/gui.h index 59a832e8b..845c07660 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -23,8 +23,6 @@ #ifndef GUI_H #define GUI_H -#include "guichanfwd.h" - #include <guichan/gui.hpp> class Graphics; diff --git a/src/gui/helpwindow.h b/src/gui/helpwindow.h index a6d83e91d..675b5c35a 100644 --- a/src/gui/helpwindow.h +++ b/src/gui/helpwindow.h @@ -33,6 +33,11 @@ class BrowserBox; class LinkHandler; +namespace gcn +{ + class ScrollArea; +} + /** * The help dialog. */ diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h index c2a214423..0aecaa81c 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/inventorywindow.h @@ -44,6 +44,12 @@ class ProgressBar; class SortListModel; class TextField; +namespace gcn +{ + class Button; + class Label; +} + /** * Inventory dialog. * diff --git a/src/gui/itemamountwindow.h b/src/gui/itemamountwindow.h index 076101c0f..0e692dac2 100644 --- a/src/gui/itemamountwindow.h +++ b/src/gui/itemamountwindow.h @@ -35,6 +35,12 @@ class ItemsModal; class ItemPopup; class Label; +namespace gcn +{ + class DropDown; + class Slider; +} + /** * Window used for selecting the amount of items to drop, trade or split. * diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h index 89f6355fe..e6cda2eae 100644 --- a/src/gui/itempopup.h +++ b/src/gui/itempopup.h @@ -33,6 +33,14 @@ class Icon; class TextBox; +namespace gcn +{ + class Button; + class CheckBox; + class Label; + class ScrollArea; +} + /** * A popup that displays information about an item. */ diff --git a/src/gui/killstats.h b/src/gui/killstats.h index 3c5c66321..af4891afe 100644 --- a/src/gui/killstats.h +++ b/src/gui/killstats.h @@ -32,6 +32,11 @@ class Label; class Button; +namespace gcn +{ + class Label; +} + class KillStats : public Window, gcn::ActionListener, public Listener { public: diff --git a/src/gui/logindialog.h b/src/gui/logindialog.h index 53149fe0d..6adfd36bd 100644 --- a/src/gui/logindialog.h +++ b/src/gui/logindialog.h @@ -37,6 +37,14 @@ class LoginData; class UpdateListModel; class UpdateTypeModel; +namespace gcn +{ + class Button; + class CheckBox; + class Label; + class TextField; +} + /** * The login dialog. * diff --git a/src/gui/npcdialog.h b/src/gui/npcdialog.h index a779fcc64..f56af664e 100644 --- a/src/gui/npcdialog.h +++ b/src/gui/npcdialog.h @@ -42,6 +42,11 @@ class TextBox; class TextField; class Button; +namespace gcn +{ + class ScrollArea; +} + /** * The npc dialog. * diff --git a/src/gui/quitdialog.h b/src/gui/quitdialog.h index dd881d283..175812bad 100644 --- a/src/gui/quitdialog.h +++ b/src/gui/quitdialog.h @@ -23,8 +23,6 @@ #ifndef QUITDIALOG_H #define QUITDIALOG_H -#include "guichanfwd.h" - #include "gui/widgets/window.h" #include <guichan/actionlistener.hpp> @@ -32,6 +30,12 @@ #include <vector> +namespace gcn +{ + class Button; + class RadioButton; +} + /** * The quit dialog. * diff --git a/src/gui/register.h b/src/gui/register.h index 606050428..188390bba 100644 --- a/src/gui/register.h +++ b/src/gui/register.h @@ -33,6 +33,13 @@ class LoginData; class OkDialog; +namespace gcn +{ + class Button; + class RadioButton; + class TextField; +} + /** * Listener used while dealing with wrong data. It is used to direct the focus * to the field which contained wrong data when the Ok button was pressed on diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h index 877b74cd8..dd92e4033 100644 --- a/src/gui/selldialog.h +++ b/src/gui/selldialog.h @@ -34,6 +34,14 @@ class Item; class ShopItems; class ShopListBox; +namespace gcn +{ + class Button; + class Label; + class ScrollArea; + class Slider; +} + /** * The sell dialog. * diff --git a/src/gui/setup.h b/src/gui/setup.h index df99855e3..975cf297b 100644 --- a/src/gui/setup.h +++ b/src/gui/setup.h @@ -25,8 +25,6 @@ #include "gui/widgets/tabbedarea.h" -#include "guichanfwd.h" - #include "gui/widgets/window.h" #include <guichan/actionlistener.hpp> diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h index e79beaab0..d6cc4f619 100644 --- a/src/gui/setup_audio.h +++ b/src/gui/setup_audio.h @@ -23,8 +23,6 @@ #ifndef GUI_SETUP_AUDIO_H #define GUI_SETUP_AUDIO_H -#include "guichanfwd.h" - #include "gui/widgets/setupitem.h" #include "gui/widgets/setuptabscroll.h" diff --git a/src/gui/setup_chat.h b/src/gui/setup_chat.h index 858dadf3a..ad3783fa1 100644 --- a/src/gui/setup_chat.h +++ b/src/gui/setup_chat.h @@ -23,8 +23,6 @@ #ifndef GUI_SETUP_CHAT_H #define GUI_SETUP_CHAT_H -#include "guichanfwd.h" - #include "gui/widgets/setuptabscroll.h" #include <guichan/actionlistener.hpp> diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h index cbcca6dfa..6ef8b0b2d 100644 --- a/src/gui/setup_colors.h +++ b/src/gui/setup_colors.h @@ -22,8 +22,6 @@ #ifndef SETUP_COLORS_H #define SETUP_COLORS_H -#include "guichanfwd.h" - #include "gui/widgets/setuptab.h" #include <guichan/actionlistener.hpp> @@ -35,6 +33,14 @@ class BrowserBox; class TextField; class TextPreview; +namespace gcn +{ + class Label; + class ListBox; + class ScrollArea; + class Slider; +} + class Setup_Colors : public SetupTab, public gcn::SelectionListener { diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h index d93d7e821..d4f54d489 100644 --- a/src/gui/setup_joystick.h +++ b/src/gui/setup_joystick.h @@ -23,8 +23,6 @@ #ifndef GUI_SETUP_JOYSTICK_H #define GUI_SETUP_JOYSTICK_H -#include "guichanfwd.h" - #include "gui/widgets/setuptab.h" #include <guichan/actionlistener.hpp> @@ -32,6 +30,13 @@ class DropDown; class NamesModel; +namespace gcn +{ + class Button; + class CheckBox; + class Label; +} + class Setup_Joystick : public SetupTab { public: diff --git a/src/gui/setup_other.h b/src/gui/setup_other.h index 45910c37c..ed29ed9cb 100644 --- a/src/gui/setup_other.h +++ b/src/gui/setup_other.h @@ -23,8 +23,6 @@ #ifndef GUI_Setup_Other_H #define GUI_Setup_Other_H -#include "guichanfwd.h" - #include "gui/widgets/setupitem.h" #include "gui/widgets/setuptabscroll.h" diff --git a/src/gui/setup_perfomance.h b/src/gui/setup_perfomance.h index 178cf3265..b8e625a1a 100644 --- a/src/gui/setup_perfomance.h +++ b/src/gui/setup_perfomance.h @@ -23,8 +23,6 @@ #ifndef GUI_SETUP_PERFOMANCE_H #define GUI_SETUP_PERFOMANCE_H -#include "guichanfwd.h" - #include "gui/widgets/setuptabscroll.h" #include <guichan/actionlistener.hpp> diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h index 8db486eb0..c66c0049e 100644 --- a/src/gui/setup_players.h +++ b/src/gui/setup_players.h @@ -23,8 +23,6 @@ #ifndef GUI_SETUP_PLAYERS_H #define GUI_SETUP_PLAYERS_H -#include "guichanfwd.h" - #include "gui/widgets/setuptabscroll.h" #include <guichan/actionlistener.hpp> diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h index 7d8abaecc..0980371b9 100644 --- a/src/gui/setup_relations.h +++ b/src/gui/setup_relations.h @@ -23,7 +23,6 @@ #ifndef GUI_SETUP_RELATIONS_H #define GUI_SETUP_RELATIONS_H -#include "guichanfwd.h" #include "playerrelations.h" #include "gui/widgets/setuptab.h" @@ -35,8 +34,17 @@ class GuiTable; class PlayerTableModel; class StaticTableModel; +namespace gcn +{ + class Button; + class CheckBox; + class DropDown; + class ListModel; + class ScrollArea; +} + class Setup_Relations : public SetupTab, - public PlayerRelationsListener + public PlayerRelationsListener { public: Setup_Relations(); diff --git a/src/gui/setup_theme.h b/src/gui/setup_theme.h index 496ba2aca..a8f87fd43 100644 --- a/src/gui/setup_theme.h +++ b/src/gui/setup_theme.h @@ -23,8 +23,6 @@ #ifndef GUI_Setup_Theme_H #define GUI_Setup_Theme_H -#include "guichanfwd.h" - #include "gui/widgets/setuptab.h" #include <guichan/actionlistener.hpp> @@ -36,6 +34,12 @@ class FontSizeChoiceListModel; class LangListModel; class ThemesModel; +namespace gcn +{ + class DropDown; + class Label; +} + class Setup_Theme : public SetupTab { public: diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index 0e7bc0f21..7443087f7 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -24,7 +24,6 @@ #define GUI_SETUP_VIDEO_H #include "being.h" -#include "guichanfwd.h" #include "gui/widgets/setuptab.h" @@ -35,6 +34,15 @@ class ModeListModel; class OpenGLListModel; class TextDialog; +namespace gcn +{ + class CheckBox; + class DropDown; + class Label; + class ListBox; + class Slider; +} + class Setup_Video : public SetupTab, public gcn::KeyListener { public: diff --git a/src/gui/setup_visual.h b/src/gui/setup_visual.h index 1b80f5b4b..0451e93ac 100644 --- a/src/gui/setup_visual.h +++ b/src/gui/setup_visual.h @@ -22,8 +22,6 @@ #ifndef GUI_SETUP_VISUAL_H #define GUI_SETUP_VISUAL_H -#include "guichanfwd.h" - #include "gui/widgets/setupitem.h" #include "gui/widgets/setuptabscroll.h" diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h index a8d131acb..dc9ae324b 100644 --- a/src/gui/shopwindow.h +++ b/src/gui/shopwindow.h @@ -23,8 +23,6 @@ #ifndef SHOP_H #define SHOP_H -#include "guichanfwd.h" - #include "gui/widgets/window.h" #include <guichan/actionlistener.hpp> @@ -37,6 +35,14 @@ class ShopItem; class ShopItems; class ShopListBox; +namespace gcn +{ + class Button; + class CheckBox; + class Label; + class ScrollArea; +} + /** * The buy dialog. * diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h index 08371e523..b0f837ccf 100644 --- a/src/gui/skilldialog.h +++ b/src/gui/skilldialog.h @@ -23,8 +23,6 @@ #ifndef SKILLDIALOG_H #define SKILLDIALOG_H -#include "guichanfwd.h" - #include "gui/widgets/window.h" #include <guichan/actionlistener.hpp> diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h index a7eeeb5d5..e2841d179 100644 --- a/src/gui/specialswindow.h +++ b/src/gui/specialswindow.h @@ -24,8 +24,6 @@ #include <vector> -#include "guichanfwd.h" - #include "playerinfo.h" #include "gui/widgets/window.h" diff --git a/src/gui/speechbubble.h b/src/gui/speechbubble.h index 5342bd49e..2f93cbd77 100644 --- a/src/gui/speechbubble.h +++ b/src/gui/speechbubble.h @@ -30,6 +30,11 @@ class TextBox; +namespace gcn +{ + class Label; +} + class SpeechBubble : public Popup { public: diff --git a/src/gui/spellpopup.h b/src/gui/spellpopup.h index e64b510fc..0cb66ca9a 100644 --- a/src/gui/spellpopup.h +++ b/src/gui/spellpopup.h @@ -32,6 +32,11 @@ class TextBox; +namespace gcn +{ + class Label; +} + /** * A popup that displays information about an item. */ diff --git a/src/gui/statuspopup.h b/src/gui/statuspopup.h index e867f0fa9..49ca7727f 100644 --- a/src/gui/statuspopup.h +++ b/src/gui/statuspopup.h @@ -32,6 +32,11 @@ class TextBox; +namespace gcn +{ + class Label; +} + /** * A popup that displays information about an item. */ diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h index c477a0099..936ea68eb 100644 --- a/src/gui/statuswindow.h +++ b/src/gui/statuswindow.h @@ -23,7 +23,6 @@ #ifndef STATUS_H #define STATUS_H -#include "guichanfwd.h" #include "listener.h" #include "gui/widgets/window.h" @@ -37,6 +36,12 @@ class ProgressBar; class ScrollArea; class VertContainer; +namespace gcn +{ + class Button; + class Label; +} + /** * The player status dialog. * diff --git a/src/gui/textdialog.h b/src/gui/textdialog.h index 03deae8f6..289b62283 100644 --- a/src/gui/textdialog.h +++ b/src/gui/textdialog.h @@ -30,6 +30,11 @@ class PasswordField; class TextField; +namespace gcn +{ + class Button; +} + /** * An option dialog. * diff --git a/src/gui/textpopup.h b/src/gui/textpopup.h index d06315171..dd901d580 100644 --- a/src/gui/textpopup.h +++ b/src/gui/textpopup.h @@ -30,6 +30,11 @@ class TextBox; +namespace gcn +{ + class Label; +} + /** * A popup that displays information about an item. */ diff --git a/src/gui/tradewindow.h b/src/gui/tradewindow.h index c917845fc..c23f006a1 100644 --- a/src/gui/tradewindow.h +++ b/src/gui/tradewindow.h @@ -23,8 +23,6 @@ #ifndef TRADEWINDOW_H #define TRADEWINDOW_H -#include "guichanfwd.h" - #include "gui/widgets/window.h" #include <guichan/actionlistener.hpp> @@ -37,6 +35,13 @@ class Item; class ItemContainer; class ScrollArea; +namespace gcn +{ + class Button; + class Label; + class TextField; +} + /** * Trade dialog. * diff --git a/src/gui/unregisterdialog.h b/src/gui/unregisterdialog.h index a89b3231b..0126fa01b 100644 --- a/src/gui/unregisterdialog.h +++ b/src/gui/unregisterdialog.h @@ -23,8 +23,6 @@ #ifndef UNREGISTERDIALOG_H #define UNREGISTERDIALOG_H -#include "guichanfwd.h" - #include "gui/widgets/window.h" #include <guichan/actionlistener.hpp> @@ -33,6 +31,12 @@ class LoginData; class OkDialog; class WrongDataNoticeListener; +namespace gcn +{ + class Button; + class TextField; +} + /** * The Unregister dialog. * diff --git a/src/gui/updaterwindow.h b/src/gui/updaterwindow.h index 5a9c95d9f..1039bbb9e 100644 --- a/src/gui/updaterwindow.h +++ b/src/gui/updaterwindow.h @@ -41,6 +41,11 @@ class ProgressBar; class ResourceManager; class ScrollArea; +namespace gcn +{ + class Label; +} + struct updateFile { public: diff --git a/src/gui/whoisonline.h b/src/gui/whoisonline.h index 7b7f9c790..94b30bfc2 100644 --- a/src/gui/whoisonline.h +++ b/src/gui/whoisonline.h @@ -41,6 +41,11 @@ class ScrollArea; struct SDL_Thread; +namespace gcn +{ + class Button; +} + class OnlinePlayer { public: diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h index e4edc8857..4e8e77003 100644 --- a/src/gui/widgets/desktop.h +++ b/src/gui/widgets/desktop.h @@ -22,14 +22,17 @@ #ifndef DESKTOP_H #define DESKTOP_H -#include "guichanfwd.h" - #include "gui/widgets/container.h" #include <guichan/widgetlistener.hpp> class Image; +namespace gcn +{ + class Label; +} + /** * Desktop widget, for drawing a background image and color. * diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h index 5572abd03..39ced1119 100644 --- a/src/gui/widgets/popup.h +++ b/src/gui/widgets/popup.h @@ -25,8 +25,6 @@ #define POPUP_H #include "configuration.h" -#include "guichanfwd.h" - #include "gui/widgets/container.h" #include <guichan/mouselistener.hpp> diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index 52f8515c7..6a1fdc026 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -23,8 +23,6 @@ #include "gui/widgets/tabbedarea.h" -#include "guichanfwd.h" - #include "gui/widgets/setuptabscroll.h" #include "gui/widgets/window.h" @@ -45,6 +43,11 @@ class Slider; class SliderList; class TextField; +namespace gcn +{ + class ListModel; +} + class SetupItem : public gcn::ActionListener { public: diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h index e931888e4..0e459a014 100644 --- a/src/gui/widgets/tablemodel.h +++ b/src/gui/widgets/tablemodel.h @@ -23,11 +23,14 @@ #ifndef TABLE_MODEL_H #define TABLE_MODEL_H -#include <guichanfwd.h> - #include <set> #include <vector> +namespace gcn +{ + class Widget; +} + class TableModelListener { public: diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index 13883980e..6e6fcdaf0 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -24,7 +24,6 @@ #define WINDOW_H #include "graphics.h" -#include "guichanfwd.h" #include "localconsts.h" #include <guichan/widgetlistener.hpp> diff --git a/src/gui/worldselectdialog.h b/src/gui/worldselectdialog.h index 1a469757f..dd78391fe 100644 --- a/src/gui/worldselectdialog.h +++ b/src/gui/worldselectdialog.h @@ -36,6 +36,12 @@ class LoginData; class WorldListModel; +namespace gcn +{ + class Button; + class ListBox; +} + /** * The server select dialog. * diff --git a/src/guichanfwd.h b/src/guichanfwd.h deleted file mode 100644 index ac63323c2..000000000 --- a/src/guichanfwd.h +++ /dev/null @@ -1,94 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2012 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef GUICHANFWD_H -#define GUICHANFWD_H - -namespace gcn -{ - class ActionEvent; - class ActionListener; - class BasicContainer; - class Button; - class CheckBox; - class ClipRectangle; - class Color; - class Container; - class DefaultFont; - class DropDown; - class Event; - class Exception; - class FocusHandler; - class FocusListener; - class Font; - class GenericInput; - class Graphics; - class Gui; - class HGEGraphics; - class HGEImage; - class HGEImageFont; - class HGEImageLoader; - class HGEInput; - class Icon; - class Image; - class InputEvent; - class ImageFont; - class Input; - class Key; - class KeyEvent; - class KeyInput; - class KeyListener; - class Label; - class ListBox; - class ListModel; - class MouseEvent; - class MouseInput; - class MouseListener; - class OpenGLGraphics; - class OpenGLImage; - class OpenGLSDLImageLoader; - class OpenLayerFont; - class OpenLayerGraphics; - class OpenLayerImage; - class OpenLayerImageLoader; - class OpenLayerInput; - class RadioButton; - class Rectangle; - class ScrollArea; - class SDLGraphics; - class SDLImage; - class SDLImageLoader; - class SDLInput; - class SDLPixel; - class SelectionEvent; - class SelectionListener; - class Slider; - class Tab; - class TabbedArea; - class TextBox; - class TextField; - class Widget; - class WidgetListener; - class Window; -} - -#endif diff --git a/src/particle.h b/src/particle.h index edb3fd6be..27bedade8 100644 --- a/src/particle.h +++ b/src/particle.h @@ -24,7 +24,6 @@ #define PARTICLE_H #include "actor.h" -#include "guichanfwd.h" #include "localconsts.h" #include "vector.h" @@ -36,6 +35,12 @@ class Particle; class ParticleEmitter; class SDLFont; +namespace gcn +{ + class Color; + class Font; +} + typedef std::list<Particle *> Particles; typedef Particles::iterator ParticleIterator; typedef Particles::const_iterator ParticleConstIterator; diff --git a/src/text.h b/src/text.h index 25fbe66f0..d7d6f0cdd 100644 --- a/src/text.h +++ b/src/text.h @@ -25,7 +25,6 @@ #define TEXT_H #include "graphics.h" -#include "guichanfwd.h" #include "localconsts.h" #include <guichan/color.hpp> diff --git a/src/textmanager.h b/src/textmanager.h index 220f30da3..471274895 100644 --- a/src/textmanager.h +++ b/src/textmanager.h @@ -24,10 +24,13 @@ #include <list> -#include "guichanfwd.h" - class Text; +namespace gcn +{ + class Graphics; +} + class TextManager { public: diff --git a/src/textparticle.h b/src/textparticle.h index c85aff476..f136be78a 100644 --- a/src/textparticle.h +++ b/src/textparticle.h @@ -23,7 +23,6 @@ #ifndef TEXTPARTICLE_H #define TEXTPARTICLE_H -#include "guichanfwd.h" #include "particle.h" class TextParticle : public Particle |