diff options
Diffstat (limited to 'src/gui/windows')
50 files changed, 70 insertions, 70 deletions
diff --git a/src/gui/windows/botcheckerwindow.h b/src/gui/windows/botcheckerwindow.h index d3615957d..e7c9ecbb0 100644 --- a/src/gui/windows/botcheckerwindow.h +++ b/src/gui/windows/botcheckerwindow.h @@ -27,7 +27,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" struct BOTCHK final { diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h index e11317cde..594fd0a30 100644 --- a/src/gui/windows/buydialog.h +++ b/src/gui/windows/buydialog.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/selectionlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/selectionlistener.hpp" class Button; class DropDown; diff --git a/src/gui/windows/buyselldialog.h b/src/gui/windows/buyselldialog.h index 34a716ee1..107730b2d 100644 --- a/src/gui/windows/buyselldialog.h +++ b/src/gui/windows/buyselldialog.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class Button; diff --git a/src/gui/windows/changeemaildialog.h b/src/gui/windows/changeemaildialog.h index 31ffa7b39..4a13d5e52 100644 --- a/src/gui/windows/changeemaildialog.h +++ b/src/gui/windows/changeemaildialog.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class Button; class LoginData; diff --git a/src/gui/windows/changepassworddialog.h b/src/gui/windows/changepassworddialog.h index ce45e6f47..011229d15 100644 --- a/src/gui/windows/changepassworddialog.h +++ b/src/gui/windows/changepassworddialog.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class Button; class LoginData; diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h index 0d73bf805..c59b631dc 100644 --- a/src/gui/windows/charcreatedialog.h +++ b/src/gui/windows/charcreatedialog.h @@ -27,8 +27,8 @@ #include "gui/windows/charselectdialog.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" class Label; class PlayerBox; diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h index 3ac5d664f..df08c9058 100644 --- a/src/gui/windows/charselectdialog.h +++ b/src/gui/windows/charselectdialog.h @@ -29,8 +29,8 @@ #include "net/charserverhandler.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" class Button; class CharacterDisplay; diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 26f665052..a21efbe52 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -68,7 +68,7 @@ #include "resources/resourcemanager.h" -#include <guichan/focushandler.hpp> +#include "gui/base/focushandler.hpp" #include <sstream> diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index 3093c52e9..742c79876 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -29,8 +29,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" #include <list> #include <map> diff --git a/src/gui/windows/confirmdialog.cpp b/src/gui/windows/confirmdialog.cpp index e48427a5b..1ba3ebf65 100644 --- a/src/gui/windows/confirmdialog.cpp +++ b/src/gui/windows/confirmdialog.cpp @@ -29,7 +29,7 @@ #include "utils/gettext.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/windows/confirmdialog.h b/src/gui/windows/confirmdialog.h index 0b092e234..9d5c9f23b 100644 --- a/src/gui/windows/confirmdialog.h +++ b/src/gui/windows/confirmdialog.h @@ -29,7 +29,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class TextBox; diff --git a/src/gui/windows/connectiondialog.h b/src/gui/windows/connectiondialog.h index 2f861bc52..dd3c84e5e 100644 --- a/src/gui/windows/connectiondialog.h +++ b/src/gui/windows/connectiondialog.h @@ -27,7 +27,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" /** * The connection dialog. diff --git a/src/gui/windows/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h index 942bcf41c..85bbe8107 100644 --- a/src/gui/windows/didyouknowwindow.h +++ b/src/gui/windows/didyouknowwindow.h @@ -26,7 +26,7 @@ #include "gui/widgets/linkhandler.h" #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class Button; class BrowserBox; diff --git a/src/gui/windows/editdialog.h b/src/gui/windows/editdialog.h index fa4a02bf7..9c84558a6 100644 --- a/src/gui/windows/editdialog.h +++ b/src/gui/windows/editdialog.h @@ -28,7 +28,7 @@ #include "gui/widgets/window.h" #include "gui/widgets/textfield.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #define ACTION_EDIT_OK "edit ok" diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h index 525005429..cbb789fbb 100644 --- a/src/gui/windows/editserverdialog.h +++ b/src/gui/windows/editserverdialog.h @@ -31,9 +31,9 @@ class ServerDialog; #include "net/serverinfo.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> -#include <guichan/listmodel.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/listmodel.hpp" /** * Server Type List Model diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index 3b97e12d7..c796c8433 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -46,7 +46,7 @@ #include "utils/dtor.h" #include "utils/gettext.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h index 7387fb249..4b6ae8b4c 100644 --- a/src/gui/windows/equipmentwindow.h +++ b/src/gui/windows/equipmentwindow.h @@ -30,7 +30,7 @@ #include "utils/xml.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include <vector> diff --git a/src/gui/windows/helpwindow.h b/src/gui/windows/helpwindow.h index 72c0d4aba..a9d1a0279 100644 --- a/src/gui/windows/helpwindow.h +++ b/src/gui/windows/helpwindow.h @@ -26,7 +26,7 @@ #include "gui/widgets/linkhandler.h" #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include "localconsts.h" diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 6fd2ab95b..23c1980be 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -57,7 +57,7 @@ #include "utils/gettext.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include <string> diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index 4e32f6fa2..da6e56a77 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -28,9 +28,9 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> -#include <guichan/selectionlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/selectionlistener.hpp" class Button; class DropDown; diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h index 7625c4a71..dd3b498fb 100644 --- a/src/gui/windows/itemamountwindow.h +++ b/src/gui/windows/itemamountwindow.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/keylistener.hpp> -#include <guichan/actionlistener.hpp> +#include "gui/base/keylistener.hpp" +#include "gui/base/actionlistener.hpp" class DropDown; class Icon; diff --git a/src/gui/windows/killstats.h b/src/gui/windows/killstats.h index 094147383..181e43a51 100644 --- a/src/gui/windows/killstats.h +++ b/src/gui/windows/killstats.h @@ -23,7 +23,7 @@ #ifndef GUI_WINDOWS_KILLSTATS_H #define GUI_WINDOWS_KILLSTATS_H -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include "depricatedlistener.h" diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h index c9d2ad61f..5099644ea 100644 --- a/src/gui/windows/logindialog.h +++ b/src/gui/windows/logindialog.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" #include <string> diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index b441b724c..093f17e29 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -59,7 +59,7 @@ #include "utils/copynpaste.h" #include "utils/gettext.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h index 5e679d7d1..21c3f93e5 100644 --- a/src/gui/windows/npcdialog.h +++ b/src/gui/windows/npcdialog.h @@ -30,7 +30,7 @@ #include "utils/stringvector.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include <list> diff --git a/src/gui/windows/npcpostdialog.h b/src/gui/windows/npcpostdialog.h index e111f150e..b8237a694 100644 --- a/src/gui/windows/npcpostdialog.h +++ b/src/gui/windows/npcpostdialog.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class TextBox; class TextField; diff --git a/src/gui/windows/okdialog.cpp b/src/gui/windows/okdialog.cpp index c16123abd..c1ce6f13f 100644 --- a/src/gui/windows/okdialog.cpp +++ b/src/gui/windows/okdialog.cpp @@ -30,7 +30,7 @@ #include "utils/gettext.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/windows/okdialog.h b/src/gui/windows/okdialog.h index 7d2ff070b..7e63c9787 100644 --- a/src/gui/windows/okdialog.h +++ b/src/gui/windows/okdialog.h @@ -27,7 +27,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class TextBox; diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h index eeedc2ec6..6d54889e6 100644 --- a/src/gui/windows/outfitwindow.h +++ b/src/gui/windows/outfitwindow.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" const unsigned int OUTFITS_COUNT = 100; const unsigned int OUTFIT_ITEM_COUNT = 16; diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h index 7ecc86c84..edb9d845e 100644 --- a/src/gui/windows/questswindow.h +++ b/src/gui/windows/questswindow.h @@ -27,7 +27,7 @@ #include "utils/xml.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include <map> #include <vector> diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h index ab395c7f4..d5d315074 100644 --- a/src/gui/windows/quitdialog.h +++ b/src/gui/windows/quitdialog.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" #include <vector> diff --git a/src/gui/windows/registerdialog.h b/src/gui/windows/registerdialog.h index 66c3e40b7..1b53581b6 100644 --- a/src/gui/windows/registerdialog.h +++ b/src/gui/windows/registerdialog.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" class Button; class LoginData; diff --git a/src/gui/windows/selldialog.h b/src/gui/windows/selldialog.h index 15db28f10..ca973ea03 100644 --- a/src/gui/windows/selldialog.h +++ b/src/gui/windows/selldialog.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/selectionlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/selectionlistener.hpp" class Button; class Item; diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 3006922c3..dec80b50a 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -44,7 +44,7 @@ #include "utils/gettext.h" #include "utils/langs.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include <string> diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h index ad6f554c6..d17ebcf42 100644 --- a/src/gui/windows/serverdialog.h +++ b/src/gui/windows/serverdialog.h @@ -31,10 +31,10 @@ #include "utils/mutex.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> -#include <guichan/listmodel.hpp> -#include <guichan/selectionlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" +#include "gui/base/listmodel.hpp" +#include "gui/base/selectionlistener.hpp" #include <string> #include <vector> diff --git a/src/gui/windows/setupwindow.h b/src/gui/windows/setupwindow.h index f5406e8ac..bd67fa860 100644 --- a/src/gui/windows/setupwindow.h +++ b/src/gui/windows/setupwindow.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include <list> diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h index 95eee1e05..2430073da 100644 --- a/src/gui/windows/shopwindow.h +++ b/src/gui/windows/shopwindow.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/selectionlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/selectionlistener.hpp" class Button; class CheckBox; diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 04baad26a..c4505b37c 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -53,7 +53,7 @@ #include "resources/beingcommon.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h index 4a6182d38..0fb6c1100 100644 --- a/src/gui/windows/skilldialog.h +++ b/src/gui/windows/skilldialog.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" const int SKILL_MIN_ID = 200000; const unsigned int SKILL_VAR_MIN_ID = 1000000; diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h index e8dc44043..283cfde69 100644 --- a/src/gui/windows/socialwindow.h +++ b/src/gui/windows/socialwindow.h @@ -26,7 +26,7 @@ #include "being/playerrelationslistener.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include <string> #include <map> diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h index 94f1aaa65..5e100b64e 100644 --- a/src/gui/windows/statuswindow.h +++ b/src/gui/windows/statuswindow.h @@ -27,7 +27,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" #include <map> diff --git a/src/gui/windows/textcommandeditor.h b/src/gui/windows/textcommandeditor.h index a31cdbaf2..4b63aaf29 100644 --- a/src/gui/windows/textcommandeditor.h +++ b/src/gui/windows/textcommandeditor.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class Button; class DropDown; diff --git a/src/gui/windows/textdialog.cpp b/src/gui/windows/textdialog.cpp index 936f08c76..c31c099fb 100644 --- a/src/gui/windows/textdialog.cpp +++ b/src/gui/windows/textdialog.cpp @@ -30,7 +30,7 @@ #include "utils/gettext.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/windows/textdialog.h b/src/gui/windows/textdialog.h index 9bfb4ae5f..58819de76 100644 --- a/src/gui/windows/textdialog.h +++ b/src/gui/windows/textdialog.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class Button; class PasswordField; diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index a379f0f28..c3a096161 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -51,7 +51,7 @@ #include "utils/gettext.h" -#include <guichan/font.hpp> +#include "gui/base/font.hpp" #include "debug.h" diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index ac49c1f52..da5c84df2 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> -#include <guichan/selectionlistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/selectionlistener.hpp" #include <memory> diff --git a/src/gui/windows/unregisterdialog.h b/src/gui/windows/unregisterdialog.h index fd40810ac..806822171 100644 --- a/src/gui/windows/unregisterdialog.h +++ b/src/gui/windows/unregisterdialog.h @@ -25,7 +25,7 @@ #include "gui/widgets/window.h" -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class Button; class LoginData; diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h index bddd3ef9e..5509168d4 100644 --- a/src/gui/windows/updaterwindow.h +++ b/src/gui/windows/updaterwindow.h @@ -30,8 +30,8 @@ #include "utils/mutex.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" #include <string> #include <vector> diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h index 10a8be4b5..da5ab010d 100644 --- a/src/gui/windows/whoisonline.h +++ b/src/gui/windows/whoisonline.h @@ -30,7 +30,7 @@ #include <set> -#include <guichan/actionlistener.hpp> +#include "gui/base/actionlistener.hpp" class BrowserBox; class Button; diff --git a/src/gui/windows/worldselectdialog.h b/src/gui/windows/worldselectdialog.h index f7491689b..0f3d857b2 100644 --- a/src/gui/windows/worldselectdialog.h +++ b/src/gui/windows/worldselectdialog.h @@ -27,8 +27,8 @@ #include "net/worldinfo.h" -#include <guichan/actionlistener.hpp> -#include <guichan/keylistener.hpp> +#include "gui/base/actionlistener.hpp" +#include "gui/base/keylistener.hpp" class Button; class ListBox; |