From 00cda69b883d6354f093be6ee39a7936cb798979 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 31 Aug 2013 22:42:10 +0300 Subject: move being related files into being dir. --- src/gui/beingpopup.cpp | 5 +++-- src/gui/botcheckerwindow.cpp | 3 ++- src/gui/charcreatedialog.h | 2 +- src/gui/charselectdialog.h | 3 ++- src/gui/chatwindow.cpp | 5 +++-- src/gui/debugwindow.cpp | 3 ++- src/gui/equipmentwindow.cpp | 5 +++-- src/gui/inventorywindow.cpp | 3 ++- src/gui/killstats.cpp | 5 +++-- src/gui/minimap.cpp | 3 ++- src/gui/ministatuswindow.cpp | 5 +++-- src/gui/npcdialog.cpp | 3 ++- src/gui/outfitwindow.cpp | 5 +++-- src/gui/popupmenu.cpp | 7 ++++--- src/gui/popupmenu.h | 2 +- src/gui/questswindow.cpp | 3 ++- src/gui/selldialog.cpp | 3 ++- src/gui/setup_chat.cpp | 3 ++- src/gui/setup_perfomance.cpp | 3 ++- src/gui/setup_players.cpp | 3 ++- src/gui/setup_relations.cpp | 3 ++- src/gui/setup_relations.h | 2 +- src/gui/setup_theme.cpp | 3 ++- src/gui/setup_video.cpp | 2 +- src/gui/setup_video.h | 2 +- src/gui/shopwindow.cpp | 7 ++++--- src/gui/socialwindow.cpp | 5 +++-- src/gui/statuspopup.cpp | 3 ++- src/gui/statuswindow.cpp | 5 +++-- src/gui/textcommandeditor.cpp | 3 ++- src/gui/tradewindow.cpp | 7 ++++--- src/gui/viewport.cpp | 5 +++-- src/gui/whoisonline.cpp | 5 +++-- src/gui/widgets/avatarlistbox.cpp | 3 ++- src/gui/widgets/battletab.cpp | 3 ++- src/gui/widgets/chattab.cpp | 3 ++- src/gui/widgets/dropshortcutcontainer.cpp | 5 +++-- src/gui/widgets/emoteshortcutcontainer.cpp | 3 ++- src/gui/widgets/gmtab.cpp | 3 ++- src/gui/widgets/guildchattab.cpp | 3 ++- src/gui/widgets/itemcontainer.cpp | 3 ++- src/gui/widgets/itemshortcutcontainer.cpp | 5 +++-- src/gui/widgets/playerbox.cpp | 3 ++- src/gui/widgets/shoplistbox.cpp | 3 ++- src/gui/widgets/skillinfo.cpp | 2 +- src/gui/widgets/skillmodel.cpp | 5 +++-- src/gui/widgets/skillmodel.h | 5 +++-- src/gui/widgets/spellshortcutcontainer.cpp | 3 ++- src/gui/widgets/tradetab.cpp | 3 ++- src/gui/widgets/whispertab.cpp | 3 ++- 50 files changed, 114 insertions(+), 70 deletions(-) (limited to 'src/gui') diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp index e5fda9ecf..2297ec9d9 100644 --- a/src/gui/beingpopup.cpp +++ b/src/gui/beingpopup.cpp @@ -21,10 +21,11 @@ #include "gui/beingpopup.h" -#include "being.h" -#include "playerrelations.h" #include "units.h" +#include "being/being.h" +#include "being/playerrelations.h" + #include "gui/gui.h" #include "gui/sdlfont.h" diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp index a18669da0..b378a22ba 100644 --- a/src/gui/botcheckerwindow.cpp +++ b/src/gui/botcheckerwindow.cpp @@ -39,7 +39,8 @@ #include "actorspritemanager.h" #include "configuration.h" -#include "localplayer.h" + +#include "being/localplayer.h" #include "utils/gettext.h" diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h index 82e7d7261..114481772 100644 --- a/src/gui/charcreatedialog.h +++ b/src/gui/charcreatedialog.h @@ -23,7 +23,7 @@ #ifndef GUI_CHARCREATEDIALOG_H #define GUI_CHARCREATEDIALOG_H -#include "being.h" +#include "being/being.h" #include "gui/charselectdialog.h" diff --git a/src/gui/charselectdialog.h b/src/gui/charselectdialog.h index 8078a2d21..2a07da188 100644 --- a/src/gui/charselectdialog.h +++ b/src/gui/charselectdialog.h @@ -23,9 +23,10 @@ #ifndef GUI_CHARSELECTDIALOG_H #define GUI_CHARSELECTDIALOG_H -#include "being.h" #include "main.h" +#include "being/being.h" + #include "gui/widgets/window.h" #include "net/charserverhandler.h" diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 8705af925..1065501b7 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -29,12 +29,13 @@ #include "configuration.h" #include "game.h" #include "guild.h" -#include "localplayer.h" #include "party.h" -#include "playerinfo.h" #include "spellshortcut.h" #include "soundmanager.h" +#include "being/localplayer.h" +#include "being/playerinfo.h" + #include "input/inputmanager.h" #include "input/keyevent.h" diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp index 2cb633589..0d7dee0c2 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/debugwindow.cpp @@ -24,9 +24,10 @@ #include "client.h" #include "game.h" -#include "localplayer.h" #include "main.h" +#include "being/localplayer.h" + #include "particle/particle.h" #include "gui/setup.h" diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index 8511c7643..af010a2d6 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -22,11 +22,12 @@ #include "gui/equipmentwindow.h" -#include "being.h" #include "graphicsvertexes.h" #include "inventory.h" #include "item.h" -#include "localplayer.h" + +#include "being/being.h" +#include "being/localplayer.h" #include "gui/itempopup.h" #include "gui/setup.h" diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index bcd2c5108..29b6c58f3 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -23,9 +23,10 @@ #include "gui/inventorywindow.h" #include "configuration.h" -#include "playerinfo.h" #include "units.h" +#include "being/playerinfo.h" + #include "input/inputmanager.h" #include "input/keyevent.h" diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp index e1472c822..516d9b449 100644 --- a/src/gui/killstats.cpp +++ b/src/gui/killstats.cpp @@ -29,8 +29,9 @@ #include "actorspritemanager.h" #include "game.h" -#include "localplayer.h" -#include "playerinfo.h" + +#include "being/localplayer.h" +#include "being/playerinfo.h" #include "utils/gettext.h" diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index cca582099..79daa8bf4 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -25,9 +25,10 @@ #include "actorspritemanager.h" #include "client.h" #include "configuration.h" -#include "localplayer.h" #include "party.h" +#include "being/localplayer.h" + #include "gui/setup.h" #include "gui/viewport.h" #include "gui/textpopup.h" diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp index 2c5e0c23a..43ace566c 100644 --- a/src/gui/ministatuswindow.cpp +++ b/src/gui/ministatuswindow.cpp @@ -23,8 +23,9 @@ #include "gui/ministatuswindow.h" #include "animatedsprite.h" -#include "localplayer.h" -#include "playerinfo.h" + +#include "being/localplayer.h" +#include "being/playerinfo.h" #include "gui/chatwindow.h" #include "gui/gui.h" diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 22cecebd2..f651d8b8e 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -23,7 +23,6 @@ #include "gui/npcdialog.h" #include "actorspritemanager.h" -#include "being.h" #include "configuration.h" #include "client.h" #include "inventory.h" @@ -31,6 +30,8 @@ #include "soundconsts.h" #include "soundmanager.h" +#include "being/being.h" + #include "gui/gui.h" #include "gui/inventorywindow.h" #include "gui/sdlfont.h" diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp index c31f1c980..7ad826307 100644 --- a/src/gui/outfitwindow.cpp +++ b/src/gui/outfitwindow.cpp @@ -29,8 +29,9 @@ #include "game.h" #include "inventory.h" #include "item.h" -#include "localplayer.h" -#include "playerinfo.h" + +#include "being/localplayer.h" +#include "being/playerinfo.h" #include "input/inputmanager.h" #include "input/keyboardconfig.h" diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 54e6f4154..b579e719b 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -30,13 +30,14 @@ #include "guildmanager.h" #include "item.h" #include "itemshortcut.h" -#include "localplayer.h" #include "maplayer.h" #include "party.h" -#include "playerinfo.h" -#include "playerrelations.h" #include "spellmanager.h" +#include "being/localplayer.h" +#include "being/playerinfo.h" +#include "being/playerrelations.h" + #include "input/inputmanager.h" #include "gui/buydialog.h" diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h index bab29fe7c..3f623280c 100644 --- a/src/gui/popupmenu.h +++ b/src/gui/popupmenu.h @@ -26,7 +26,7 @@ #include "gui/widgets/linkhandler.h" #include "gui/widgets/popup.h" -#include "actorsprite.h" +#include "being/actorsprite.h" #include #include diff --git a/src/gui/questswindow.cpp b/src/gui/questswindow.cpp index d863e3dbd..896d66af3 100644 --- a/src/gui/questswindow.cpp +++ b/src/gui/questswindow.cpp @@ -23,9 +23,10 @@ #include "actorspritemanager.h" #include "configuration.h" #include "effectmanager.h" -#include "localplayer.h" #include "soundmanager.h" +#include "being/localplayer.h" + #include "gui/gui.h" #include "gui/sdlfont.h" diff --git a/src/gui/selldialog.cpp b/src/gui/selldialog.cpp index f57db6dbd..97b0fbdc1 100644 --- a/src/gui/selldialog.cpp +++ b/src/gui/selldialog.cpp @@ -22,10 +22,11 @@ #include "gui/selldialog.h" -#include "playerinfo.h" #include "shopitem.h" #include "units.h" +#include "being/playerinfo.h" + #include "gui/confirmdialog.h" #include "gui/setup.h" #include "gui/tradewindow.h" diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp index 41000d5dd..91a9dd859 100644 --- a/src/gui/setup_chat.cpp +++ b/src/gui/setup_chat.cpp @@ -35,7 +35,8 @@ #include "gui/widgets/setupitem.h" #include "configuration.h" -#include "localplayer.h" + +#include "being/localplayer.h" #include "utils/gettext.h" diff --git a/src/gui/setup_perfomance.cpp b/src/gui/setup_perfomance.cpp index c58240af9..c53f2a970 100644 --- a/src/gui/setup_perfomance.cpp +++ b/src/gui/setup_perfomance.cpp @@ -36,7 +36,8 @@ #include "gui/widgets/setupitem.h" #include "configuration.h" -#include "localplayer.h" + +#include "being/localplayer.h" #include "utils/gettext.h" diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp index fb7b9861d..bd2b829fd 100644 --- a/src/gui/setup_players.cpp +++ b/src/gui/setup_players.cpp @@ -35,7 +35,8 @@ #include "gui/widgets/setupitem.h" #include "configuration.h" -#include "localplayer.h" + +#include "being/localplayer.h" #include "utils/gettext.h" diff --git a/src/gui/setup_relations.cpp b/src/gui/setup_relations.cpp index 644817331..af6e0420a 100644 --- a/src/gui/setup_relations.cpp +++ b/src/gui/setup_relations.cpp @@ -24,7 +24,8 @@ #include "actorspritemanager.h" #include "configuration.h" -#include "localplayer.h" + +#include "being/localplayer.h" #include "gui/editdialog.h" #include "gui/okdialog.h" diff --git a/src/gui/setup_relations.h b/src/gui/setup_relations.h index cac44c470..734b06943 100644 --- a/src/gui/setup_relations.h +++ b/src/gui/setup_relations.h @@ -23,7 +23,7 @@ #ifndef GUI_SETUP_RELATIONS_H #define GUI_SETUP_RELATIONS_H -#include "playerrelations.h" +#include "being/playerrelations.h" #include "gui/widgets/setuptab.h" diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp index 200b86219..b7cd9bfa1 100644 --- a/src/gui/setup_theme.cpp +++ b/src/gui/setup_theme.cpp @@ -35,7 +35,8 @@ #include "gui/widgets/namesmodel.h" #include "configuration.h" -#include "localplayer.h" + +#include "being/localplayer.h" #include "utils/gettext.h" diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 12ae9fe83..594d5ff4d 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -28,7 +28,7 @@ #include "graphicsmanager.h" -#include "localplayer.h" +#include "being/localplayer.h" #include "gui/gui.h" #include "gui/okdialog.h" diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h index 2c0224f06..7974e8e3d 100644 --- a/src/gui/setup_video.h +++ b/src/gui/setup_video.h @@ -23,7 +23,7 @@ #ifndef GUI_SETUP_VIDEO_H #define GUI_SETUP_VIDEO_H -#include "being.h" +#include "being/being.h" #include "gui/widgets/setuptab.h" diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp index 04b994b7f..237715141 100644 --- a/src/gui/shopwindow.cpp +++ b/src/gui/shopwindow.cpp @@ -45,14 +45,15 @@ #include "confirmdialog.h" #include "inventory.h" #include "item.h" -#include "localplayer.h" -#include "playerinfo.h" -#include "playerrelations.h" #include "shopitem.h" #include "soundconsts.h" #include "soundmanager.h" #include "units.h" +#include "being/localplayer.h" +#include "being/playerinfo.h" +#include "being/playerrelations.h" + #include "net/net.h" #include "net/chathandler.h" #include "net/npchandler.h" diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp index baeaf847f..72bd920d6 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/socialwindow.cpp @@ -24,10 +24,11 @@ #include "actorspritemanager.h" #include "guild.h" #include "guildmanager.h" -#include "localplayer.h" #include "maplayer.h" #include "party.h" -#include "playerrelations.h" + +#include "being/localplayer.h" +#include "being/playerrelations.h" #include "input/inputmanager.h" #include "input/keyboardconfig.h" diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp index 3c1479594..2e6569031 100644 --- a/src/gui/statuspopup.cpp +++ b/src/gui/statuspopup.cpp @@ -30,9 +30,10 @@ #include "gui/widgets/layout.h" #include "gui/widgets/textbox.h" -#include "localplayer.h" #include "units.h" +#include "being/localplayer.h" + #include "input/inputmanager.h" #include "input/keyboardconfig.h" diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp index fe5ec917d..585c950e6 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/statuswindow.cpp @@ -27,10 +27,11 @@ #include "equipment.h" #include "inventory.h" #include "item.h" -#include "localplayer.h" -#include "playerinfo.h" #include "units.h" +#include "being/localplayer.h" +#include "being/playerinfo.h" + #include "gui/equipmentwindow.h" #include "gui/setup.h" #include "gui/viewport.h" diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp index 7ad27c50f..9ba33c830 100644 --- a/src/gui/textcommandeditor.cpp +++ b/src/gui/textcommandeditor.cpp @@ -24,10 +24,11 @@ #include "configuration.h" #include "item.h" -#include "localplayer.h" #include "main.h" #include "spellmanager.h" +#include "being/localplayer.h" + #include "input/keyboardconfig.h" #include "gui/chatwindow.h" diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp index a71b26f60..e60472526 100644 --- a/src/gui/tradewindow.cpp +++ b/src/gui/tradewindow.cpp @@ -25,11 +25,12 @@ #include "configuration.h" #include "inventory.h" #include "item.h" -#include "localplayer.h" -#include "playerinfo.h" -#include "playerrelations.h" #include "units.h" +#include "being/localplayer.h" +#include "being/playerinfo.h" +#include "being/playerrelations.h" + #include "gui/gui.h" #include "gui/inventorywindow.h" #include "gui/itemamountwindow.h" diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index e8ae6bd6c..e210e043b 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -27,11 +27,12 @@ #include "configuration.h" #include "game.h" #include "itemshortcut.h" -#include "localplayer.h" -#include "playerinfo.h" #include "sdlshared.h" #include "textmanager.h" +#include "being/localplayer.h" +#include "being/playerinfo.h" + #include "input/inputmanager.h" #include "input/keyboardconfig.h" diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index c1ea05881..d045b3876 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -36,10 +36,11 @@ #include "actorspritemanager.h" #include "client.h" #include "configuration.h" -#include "localplayer.h" -#include "playerrelations.h" #include "main.h" +#include "being/localplayer.h" +#include "being/playerrelations.h" + #include "net/download.h" #include "net/net.h" #include "net/playerhandler.h" diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 1bb3ca235..aacb3aabe 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -24,9 +24,10 @@ #include "actorspritemanager.h" #include "configuration.h" #include "guild.h" -#include "localplayer.h" #include "maplayer.h" +#include "being/localplayer.h" + #include "gui/chatwindow.h" #include "gui/gui.h" #include "gui/sdlfont.h" diff --git a/src/gui/widgets/battletab.cpp b/src/gui/widgets/battletab.cpp index 5cc770478..440977c37 100644 --- a/src/gui/widgets/battletab.cpp +++ b/src/gui/widgets/battletab.cpp @@ -24,9 +24,10 @@ #include "chatlogger.h" #include "configuration.h" -#include "localplayer.h" #include "main.h" +#include "being/localplayer.h" + #include "net/net.h" #include "resources/iteminfo.h" diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 1cb2e9d82..fba603ee6 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -27,10 +27,11 @@ #include "client.h" #include "commandhandler.h" #include "configuration.h" -#include "localplayer.h" #include "soundconsts.h" #include "soundmanager.h" +#include "being/localplayer.h" + #include "gui/helpwindow.h" #include "gui/widgets/scrollarea.h" diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp index 96d068ade..89fcf1ecd 100644 --- a/src/gui/widgets/dropshortcutcontainer.cpp +++ b/src/gui/widgets/dropshortcutcontainer.cpp @@ -25,8 +25,9 @@ #include "client.h" #include "dragdrop.h" #include "dropshortcut.h" -#include "localplayer.h" -#include "playerinfo.h" + +#include "being/localplayer.h" +#include "being/playerinfo.h" #include "input/keyboardconfig.h" diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp index d72f5379d..0bdb0aa31 100644 --- a/src/gui/widgets/emoteshortcutcontainer.cpp +++ b/src/gui/widgets/emoteshortcutcontainer.cpp @@ -28,7 +28,8 @@ #include "inventory.h" #include "item.h" #include "itemshortcut.h" -#include "localplayer.h" + +#include "being/localplayer.h" #include "input/inputmanager.h" #include "input/keyboardconfig.h" diff --git a/src/gui/widgets/gmtab.cpp b/src/gui/widgets/gmtab.cpp index 854a67692..ee9d7caa1 100644 --- a/src/gui/widgets/gmtab.cpp +++ b/src/gui/widgets/gmtab.cpp @@ -22,7 +22,8 @@ #include "chatlogger.h" #include "commands.h" -#include "localplayer.h" + +#include "being/localplayer.h" #include "net/chathandler.h" #include "net/net.h" diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp index 3e09156fd..6394ac3ad 100644 --- a/src/gui/widgets/guildchattab.cpp +++ b/src/gui/widgets/guildchattab.cpp @@ -26,10 +26,11 @@ #include "configuration.h" #include "guild.h" #include "guildmanager.h" -#include "localplayer.h" #include "soundconsts.h" #include "soundmanager.h" +#include "being/localplayer.h" + #include "resources/iteminfo.h" #include "resources/itemdb.h" diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index f3fb21336..99aedabcd 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -27,7 +27,8 @@ #include "inventory.h" #include "item.h" #include "itemshortcut.h" -#include "playerinfo.h" + +#include "being/playerinfo.h" #include "gui/chatwindow.h" #include "gui/gui.h" diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 40eaefcf9..0466706df 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -29,8 +29,9 @@ #include "item.h" #include "itemshortcut.h" #include "spellshortcut.h" -#include "localplayer.h" -#include "playerinfo.h" + +#include "being/localplayer.h" +#include "being/playerinfo.h" #include "input/inputmanager.h" #include "input/keyboardconfig.h" diff --git a/src/gui/widgets/playerbox.cpp b/src/gui/widgets/playerbox.cpp index 6a5c815d4..31ee7c123 100644 --- a/src/gui/widgets/playerbox.cpp +++ b/src/gui/widgets/playerbox.cpp @@ -23,10 +23,11 @@ #include "gui/widgets/playerbox.h" #include "animatedsprite.h" -#include "being.h" #include "client.h" #include "configuration.h" +#include "being/being.h" + #include "resources/image.h" #include "utils/dtor.h" diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp index b7e0ad120..2a98b4441 100644 --- a/src/gui/widgets/shoplistbox.cpp +++ b/src/gui/widgets/shoplistbox.cpp @@ -24,9 +24,10 @@ #include "client.h" #include "configuration.h" -#include "playerinfo.h" #include "shopitem.h" +#include "being/playerinfo.h" + #include "gui/itempopup.h" #include "gui/viewport.h" diff --git a/src/gui/widgets/skillinfo.cpp b/src/gui/widgets/skillinfo.cpp index 809e34b0d..2f0dcb5b5 100644 --- a/src/gui/widgets/skillinfo.cpp +++ b/src/gui/widgets/skillinfo.cpp @@ -22,7 +22,7 @@ #include "gui/widgets/skillinfo.h" -#include "playerinfo.h" +#include "being/playerinfo.h" #include "gui/widgets/skillmodel.h" diff --git a/src/gui/widgets/skillmodel.cpp b/src/gui/widgets/skillmodel.cpp index 1792c41fd..c4a298640 100644 --- a/src/gui/widgets/skillmodel.cpp +++ b/src/gui/widgets/skillmodel.cpp @@ -25,8 +25,9 @@ #include "configuration.h" #include "effectmanager.h" #include "itemshortcut.h" -#include "localplayer.h" -#include "playerinfo.h" + +#include "being/localplayer.h" +#include "being/playerinfo.h" #include "gui/setup.h" #include "gui/shortcutwindow.h" diff --git a/src/gui/widgets/skillmodel.h b/src/gui/widgets/skillmodel.h index da5779672..8e6debb7e 100644 --- a/src/gui/widgets/skillmodel.h +++ b/src/gui/widgets/skillmodel.h @@ -26,8 +26,9 @@ #include "configuration.h" #include "effectmanager.h" #include "itemshortcut.h" -#include "localplayer.h" -#include "playerinfo.h" + +#include "being/localplayer.h" +#include "being/playerinfo.h" #include "gui/setup.h" #include "gui/shortcutwindow.h" diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index 0ffb25b1d..433001f3b 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -25,9 +25,10 @@ #include "client.h" #include "dragdrop.h" #include "itemshortcut.h" -#include "localplayer.h" #include "spellshortcut.h" +#include "being/localplayer.h" + #include "input/keyboardconfig.h" #include "gui/inventorywindow.h" diff --git a/src/gui/widgets/tradetab.cpp b/src/gui/widgets/tradetab.cpp index e2ef34536..61becb7da 100644 --- a/src/gui/widgets/tradetab.cpp +++ b/src/gui/widgets/tradetab.cpp @@ -23,7 +23,8 @@ #include "gui/widgets/tradetab.h" #include "chatlogger.h" -#include "localplayer.h" + +#include "being/localplayer.h" #include "net/net.h" diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp index dbca226a8..b836ee729 100644 --- a/src/gui/widgets/whispertab.cpp +++ b/src/gui/widgets/whispertab.cpp @@ -24,7 +24,8 @@ #include "chatlogger.h" #include "commands.h" -#include "localplayer.h" + +#include "being/localplayer.h" #include "net/chathandler.h" #include "net/net.h" -- cgit v1.2.3-60-g2f50