diff options
| -rw-r--r-- | Android.mk | 1 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 180 | ||||
| -rw-r--r-- | src/Makefile.am | 180 | ||||
| -rw-r--r-- | src/actionmanager.cpp | 46 | ||||
| -rw-r--r-- | src/actorspritemanager.cpp | 6 | ||||
| -rw-r--r-- | src/being/being.cpp | 7 | ||||
| -rw-r--r-- | src/being/localplayer.cpp | 17 | ||||
| -rw-r--r-- | src/being/playerinfo.cpp | 6 | ||||
| -rw-r--r-- | src/client.cpp | 41 | ||||
| -rw-r--r-- | src/commands.cpp | 15 | ||||
| -rw-r--r-- | src/game.cpp | 43 | ||||
| -rw-r--r-- | src/gui/popupmenu.cpp | 27 | ||||
| -rw-r--r-- | src/gui/setup_chat.cpp | 2 | ||||
| -rw-r--r-- | src/gui/setup_input.cpp | 3 | ||||
| -rw-r--r-- | src/gui/setup_theme.cpp | 3 | ||||
| -rw-r--r-- | src/gui/setup_video.cpp | 4 | ||||
| -rw-r--r-- | src/gui/viewport.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/avatarlistbox.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/characterdisplay.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/characterviewbase.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/chattab.cpp | 2 | ||||
| -rw-r--r-- | src/gui/widgets/chattab.h | 2 | ||||
| -rw-r--r-- | src/gui/widgets/dropshortcutcontainer.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 7 | ||||
| -rw-r--r-- | src/gui/widgets/itemlinkhandler.cpp | 5 | ||||
| -rw-r--r-- | src/gui/widgets/itemshortcutcontainer.cpp | 5 | ||||
| -rw-r--r-- | src/gui/widgets/setupitem.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/spellshortcutcontainer.cpp | 5 | ||||
| -rw-r--r-- | src/gui/windowmenu.cpp | 7 | ||||
| -rw-r--r-- | src/gui/windows/botcheckerwindow.cpp (renamed from src/gui/botcheckerwindow.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/botcheckerwindow.h (renamed from src/gui/botcheckerwindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/buydialog.cpp (renamed from src/gui/buydialog.cpp) | 4 | ||||
| -rw-r--r-- | src/gui/windows/buydialog.h (renamed from src/gui/buydialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/buyselldialog.cpp (renamed from src/gui/buyselldialog.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/buyselldialog.h (renamed from src/gui/buyselldialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/changeemaildialog.cpp (renamed from src/gui/changeemaildialog.cpp) | 6 | ||||
| -rw-r--r-- | src/gui/windows/changeemaildialog.h (renamed from src/gui/changeemaildialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/changepassworddialog.cpp (renamed from src/gui/changepassworddialog.cpp) | 6 | ||||
| -rw-r--r-- | src/gui/windows/changepassworddialog.h (renamed from src/gui/changepassworddialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/charcreatedialog.cpp (renamed from src/gui/charcreatedialog.cpp) | 4 | ||||
| -rw-r--r-- | src/gui/windows/charcreatedialog.h (renamed from src/gui/charcreatedialog.h) | 2 | ||||
| -rw-r--r-- | src/gui/windows/charselectdialog.cpp (renamed from src/gui/charselectdialog.cpp) | 12 | ||||
| -rw-r--r-- | src/gui/windows/charselectdialog.h (renamed from src/gui/charselectdialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/chatwindow.cpp (renamed from src/gui/chatwindow.cpp) | 9 | ||||
| -rw-r--r-- | src/gui/windows/chatwindow.h (renamed from src/gui/chatwindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/confirmdialog.cpp (renamed from src/gui/confirmdialog.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/confirmdialog.h (renamed from src/gui/confirmdialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/connectiondialog.cpp (renamed from src/gui/connectiondialog.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/connectiondialog.h (renamed from src/gui/connectiondialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/debugwindow.cpp (renamed from src/gui/debugwindow.cpp) | 5 | ||||
| -rw-r--r-- | src/gui/windows/debugwindow.h (renamed from src/gui/debugwindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/didyouknowwindow.cpp (renamed from src/gui/didyouknowwindow.cpp) | 5 | ||||
| -rw-r--r-- | src/gui/windows/didyouknowwindow.h (renamed from src/gui/didyouknowwindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/editdialog.cpp (renamed from src/gui/editdialog.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/editdialog.h (renamed from src/gui/editdialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/editserverdialog.cpp (renamed from src/gui/editserverdialog.cpp) | 6 | ||||
| -rw-r--r-- | src/gui/windows/editserverdialog.h (renamed from src/gui/editserverdialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/emotewindow.cpp (renamed from src/gui/emotewindow.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/emotewindow.h (renamed from src/gui/emotewindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/equipmentwindow.cpp (renamed from src/gui/equipmentwindow.cpp) | 5 | ||||
| -rw-r--r-- | src/gui/windows/equipmentwindow.h (renamed from src/gui/equipmentwindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/helpwindow.cpp (renamed from src/gui/helpwindow.cpp) | 7 | ||||
| -rw-r--r-- | src/gui/windows/helpwindow.h (renamed from src/gui/helpwindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/inventorywindow.cpp (renamed from src/gui/inventorywindow.cpp) | 16 | ||||
| -rw-r--r-- | src/gui/windows/inventorywindow.h (renamed from src/gui/inventorywindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/itemamountwindow.cpp (renamed from src/gui/itemamountwindow.cpp) | 7 | ||||
| -rw-r--r-- | src/gui/windows/itemamountwindow.h (renamed from src/gui/itemamountwindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/killstats.cpp (renamed from src/gui/killstats.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/killstats.h (renamed from src/gui/killstats.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/logindialog.cpp (renamed from src/gui/logindialog.cpp) | 4 | ||||
| -rw-r--r-- | src/gui/windows/logindialog.h (renamed from src/gui/logindialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/minimap.cpp (renamed from src/gui/minimap.cpp) | 5 | ||||
| -rw-r--r-- | src/gui/windows/minimap.h (renamed from src/gui/minimap.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/ministatuswindow.cpp (renamed from src/gui/ministatuswindow.cpp) | 5 | ||||
| -rw-r--r-- | src/gui/windows/ministatuswindow.h (renamed from src/gui/ministatuswindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/npcdialog.cpp (renamed from src/gui/npcdialog.cpp) | 5 | ||||
| -rw-r--r-- | src/gui/windows/npcdialog.h (renamed from src/gui/npcdialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/npcpostdialog.cpp (renamed from src/gui/npcpostdialog.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/npcpostdialog.h (renamed from src/gui/npcpostdialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/okdialog.cpp (renamed from src/gui/okdialog.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/okdialog.h (renamed from src/gui/okdialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/outfitwindow.cpp (renamed from src/gui/outfitwindow.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/outfitwindow.h (renamed from src/gui/outfitwindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/questswindow.cpp (renamed from src/gui/questswindow.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/questswindow.h (renamed from src/gui/questswindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/quitdialog.cpp (renamed from src/gui/quitdialog.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/quitdialog.h (renamed from src/gui/quitdialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/registerdialog.cpp (renamed from src/gui/registerdialog.cpp) | 4 | ||||
| -rw-r--r-- | src/gui/windows/registerdialog.h (renamed from src/gui/registerdialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/selldialog.cpp (renamed from src/gui/selldialog.cpp) | 6 | ||||
| -rw-r--r-- | src/gui/windows/selldialog.h (renamed from src/gui/selldialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/serverdialog.cpp (renamed from src/gui/serverdialog.cpp) | 7 | ||||
| -rw-r--r-- | src/gui/windows/serverdialog.h (renamed from src/gui/serverdialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/setup.cpp (renamed from src/gui/setup.cpp) | 5 | ||||
| -rw-r--r-- | src/gui/windows/setup.h (renamed from src/gui/setup.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/shopwindow.cpp (renamed from src/gui/shopwindow.cpp) | 13 | ||||
| -rw-r--r-- | src/gui/windows/shopwindow.h (renamed from src/gui/shopwindow.h) | 3 | ||||
| -rw-r--r-- | src/gui/windows/shortcutwindow.cpp (renamed from src/gui/shortcutwindow.cpp) | 4 | ||||
| -rw-r--r-- | src/gui/windows/shortcutwindow.h (renamed from src/gui/shortcutwindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/skilldialog.cpp (renamed from src/gui/skilldialog.cpp) | 7 | ||||
| -rw-r--r-- | src/gui/windows/skilldialog.h (renamed from src/gui/skilldialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/socialwindow.cpp (renamed from src/gui/socialwindow.cpp) | 15 | ||||
| -rw-r--r-- | src/gui/windows/socialwindow.h (renamed from src/gui/socialwindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/statuswindow.cpp (renamed from src/gui/statuswindow.cpp) | 10 | ||||
| -rw-r--r-- | src/gui/windows/statuswindow.h (renamed from src/gui/statuswindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/textcommandeditor.cpp (renamed from src/gui/textcommandeditor.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/textcommandeditor.h (renamed from src/gui/textcommandeditor.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/textdialog.cpp (renamed from src/gui/textdialog.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/textdialog.h (renamed from src/gui/textdialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/tradewindow.cpp (renamed from src/gui/tradewindow.cpp) | 9 | ||||
| -rw-r--r-- | src/gui/windows/tradewindow.h (renamed from src/gui/tradewindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/unregisterdialog.cpp (renamed from src/gui/unregisterdialog.cpp) | 6 | ||||
| -rw-r--r-- | src/gui/windows/unregisterdialog.h (renamed from src/gui/unregisterdialog.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/updaterwindow.cpp (renamed from src/gui/updaterwindow.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/updaterwindow.h (renamed from src/gui/updaterwindow.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/whoisonline.cpp (renamed from src/gui/whoisonline.cpp) | 7 | ||||
| -rw-r--r-- | src/gui/windows/whoisonline.h (renamed from src/gui/whoisonline.h) | 0 | ||||
| -rw-r--r-- | src/gui/windows/worldselectdialog.cpp (renamed from src/gui/worldselectdialog.cpp) | 2 | ||||
| -rw-r--r-- | src/gui/windows/worldselectdialog.h (renamed from src/gui/worldselectdialog.h) | 0 | ||||
| -rw-r--r-- | src/guildmanager.cpp | 2 | ||||
| -rw-r--r-- | src/input/inputmanager.cpp | 16 | ||||
| -rw-r--r-- | src/itemshortcut.cpp | 2 | ||||
| -rw-r--r-- | src/net/charserverhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/beinghandler.cpp | 12 | ||||
| -rw-r--r-- | src/net/ea/buysellhandler.cpp | 11 | ||||
| -rw-r--r-- | src/net/ea/charserverhandler.cpp | 4 | ||||
| -rw-r--r-- | src/net/ea/chathandler.cpp | 4 | ||||
| -rw-r--r-- | src/net/ea/gamehandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/guildhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/inventoryhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/inventoryhandler.h | 2 | ||||
| -rw-r--r-- | src/net/ea/loginhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/npchandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/partyhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/playerhandler.cpp | 11 | ||||
| -rw-r--r-- | src/net/ea/skillhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/ea/tradehandler.cpp | 4 | ||||
| -rw-r--r-- | src/net/eathena/beinghandler.cpp | 7 | ||||
| -rw-r--r-- | src/net/eathena/buysellhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/generalhandler.cpp | 8 | ||||
| -rw-r--r-- | src/net/eathena/npchandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/buysellhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/generalhandler.cpp | 8 | ||||
| -rw-r--r-- | src/net/tmwa/npchandler.cpp | 3 | ||||
| -rw-r--r-- | src/net/tmwa/playerhandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/questhandler.cpp | 4 | ||||
| -rw-r--r-- | src/spellmanager.cpp | 2 |
147 files changed, 522 insertions, 474 deletions
diff --git a/Android.mk b/Android.mk index 3e2e0d39b..5bac92b93 100644 --- a/Android.mk +++ b/Android.mk @@ -33,6 +33,7 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \ $(wildcard $(LOCAL_PATH)/src/being/*.cpp) \ $(wildcard $(LOCAL_PATH)/src/gui/*.cpp) \ $(wildcard $(LOCAL_PATH)/src/gui/widgets/*.cpp) \ + $(wildcard $(LOCAL_PATH)/src/gui/windows/*.cpp) \ $(wildcard $(LOCAL_PATH)/src/guichan/*.cpp) \ $(wildcard $(LOCAL_PATH)/src/guichan/widgets/*.cpp) \ $(wildcard $(LOCAL_PATH)/src/input/*.cpp) \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2c33d96c0..e2acfb4dc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -253,90 +253,90 @@ SET(SRCS gui/widgets/windowcontainer.h gui/beingpopup.cpp gui/beingpopup.h - gui/buydialog.cpp - gui/buydialog.h - gui/buyselldialog.cpp - gui/buyselldialog.h - gui/changeemaildialog.cpp - gui/changeemaildialog.h - gui/changepassworddialog.cpp - gui/changepassworddialog.h - gui/charselectdialog.cpp - gui/charselectdialog.h - gui/charcreatedialog.cpp - gui/charcreatedialog.h - gui/chatwindow.cpp - gui/chatwindow.h - gui/confirmdialog.cpp - gui/confirmdialog.h - gui/connectiondialog.cpp - gui/connectiondialog.h - gui/debugwindow.cpp - gui/debugwindow.h - gui/didyouknowwindow.cpp - gui/didyouknowwindow.h - gui/editserverdialog.cpp - gui/editserverdialog.h - gui/emotewindow.cpp - gui/emotewindow.h - gui/equipmentwindow.cpp - gui/equipmentwindow.h + gui/windows/buydialog.cpp + gui/windows/buydialog.h + gui/windows/buyselldialog.cpp + gui/windows/buyselldialog.h + gui/windows/changeemaildialog.cpp + gui/windows/changeemaildialog.h + gui/windows/changepassworddialog.cpp + gui/windows/changepassworddialog.h + gui/windows/charselectdialog.cpp + gui/windows/charselectdialog.h + gui/windows/charcreatedialog.cpp + gui/windows/charcreatedialog.h + gui/windows/chatwindow.cpp + gui/windows/chatwindow.h + gui/windows/confirmdialog.cpp + gui/windows/confirmdialog.h + gui/windows/connectiondialog.cpp + gui/windows/connectiondialog.h + gui/windows/debugwindow.cpp + gui/windows/debugwindow.h + gui/windows/didyouknowwindow.cpp + gui/windows/didyouknowwindow.h + gui/windows/editdialog.cpp + gui/windows/editdialog.h + gui/windows/editserverdialog.cpp + gui/windows/editserverdialog.h + gui/windows/emotewindow.cpp + gui/windows/emotewindow.h + gui/windows/equipmentwindow.cpp + gui/windows/equipmentwindow.h gui/focushandler.cpp gui/focushandler.h gui/gui.cpp gui/gui.h - gui/helpwindow.cpp - gui/helpwindow.h - gui/inventorywindow.cpp - gui/inventorywindow.h + gui/windows/helpwindow.cpp + gui/windows/helpwindow.h + gui/windows/inventorywindow.cpp + gui/windows/inventorywindow.h + gui/windows/itemamountwindow.cpp + gui/windows/itemamountwindow.h gui/itempopup.cpp gui/itempopup.h gui/spellpopup.cpp gui/spellpopup.h gui/statuspopup.cpp gui/statuspopup.h - gui/killstats.cpp - gui/killstats.h - gui/itemamountwindow.cpp - gui/itemamountwindow.h - gui/logindialog.cpp - gui/logindialog.h - gui/minimap.cpp - gui/minimap.h - gui/ministatuswindow.cpp - gui/ministatuswindow.h - gui/npcdialog.cpp - gui/npcdialog.h - gui/npcpostdialog.cpp - gui/npcpostdialog.h - gui/okdialog.cpp - gui/okdialog.h - gui/editdialog.cpp - gui/editdialog.h - gui/outfitwindow.cpp - gui/outfitwindow.h - gui/botcheckerwindow.cpp - gui/botcheckerwindow.h - gui/textcommandeditor.cpp - gui/textcommandeditor.h + gui/windows/killstats.cpp + gui/windows/killstats.h + gui/windows/logindialog.cpp + gui/windows/logindialog.h + gui/windows/minimap.cpp + gui/windows/minimap.h + gui/windows/ministatuswindow.cpp + gui/windows/ministatuswindow.h + gui/windows/npcdialog.cpp + gui/windows/npcdialog.h + gui/windows/npcpostdialog.cpp + gui/windows/npcpostdialog.h + gui/windows/okdialog.cpp + gui/windows/okdialog.h + gui/windows/outfitwindow.cpp + gui/windows/outfitwindow.h + gui/windows/botcheckerwindow.cpp + gui/windows/botcheckerwindow.h + gui/windows/textcommandeditor.cpp + gui/windows/textcommandeditor.h gui/palette.cpp gui/palette.h gui/popupmenu.cpp gui/popupmenu.h - gui/questswindow.cpp - gui/questswindow.h - gui/quitdialog.cpp - gui/quitdialog.h - gui/registerdialog.cpp - gui/registerdialog.h + gui/windows/questswindow.cpp + gui/windows/questswindow.h + gui/windows/quitdialog.cpp + gui/windows/quitdialog.h + gui/windows/registerdialog.cpp + gui/windows/registerdialog.h gui/sdlinput.cpp gui/sdlinput.h - gui/selldialog.cpp - gui/selldialog.h - gui/serverdialog.cpp - gui/serverdialog.h - gui/setup.cpp - gui/setup.h + gui/windows/selldialog.cpp + gui/windows/selldialog.h + gui/windows/serverdialog.cpp + gui/windows/serverdialog.h + gui/windows/setup.cpp + gui/windows/setup.h gui/setup_audio.cpp gui/setup_audio.h gui/setup_colors.cpp @@ -366,40 +366,40 @@ SET(SRCS gui/setupactiondata.h gui/sdlfont.cpp gui/sdlfont.h - gui/shopwindow.cpp - gui/shopwindow.h - gui/shortcutwindow.cpp - gui/shortcutwindow.h - gui/skilldialog.cpp - gui/skilldialog.h - gui/socialwindow.cpp - gui/socialwindow.h + gui/windows/shopwindow.cpp + gui/windows/shopwindow.h + gui/windows/shortcutwindow.cpp + gui/windows/shortcutwindow.h + gui/windows/skilldialog.cpp + gui/windows/skilldialog.h + gui/windows/socialwindow.cpp + gui/windows/socialwindow.h gui/speechbubble.cpp gui/speechbubble.h - gui/statuswindow.cpp - gui/statuswindow.h - gui/textdialog.cpp - gui/textdialog.h + gui/windows/statuswindow.cpp + gui/windows/statuswindow.h + gui/windows/textdialog.cpp + gui/windows/textdialog.h gui/textpopup.cpp gui/textpopup.h gui/theme.cpp gui/theme.h - gui/tradewindow.cpp - gui/tradewindow.h - gui/unregisterdialog.cpp - gui/unregisterdialog.h - gui/updaterwindow.cpp - gui/updaterwindow.h + gui/windows/tradewindow.cpp + gui/windows/tradewindow.h + gui/windows/unregisterdialog.cpp + gui/windows/unregisterdialog.h + gui/windows/updaterwindow.cpp + gui/windows/updaterwindow.h gui/userpalette.cpp gui/userpalette.h gui/viewport.cpp gui/viewport.h - gui/whoisonline.cpp - gui/whoisonline.h + gui/windows/whoisonline.cpp + gui/windows/whoisonline.h gui/windowmenu.cpp gui/windowmenu.h - gui/worldselectdialog.cpp - gui/worldselectdialog.h + gui/windows/worldselectdialog.cpp + gui/windows/worldselectdialog.h net/adminhandler.h net/charserverhandler.cpp net/charserverhandler.h diff --git a/src/Makefile.am b/src/Makefile.am index 710031fa1..b23baeaca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -262,90 +262,90 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/widgets/windowcontainer.h \ gui/beingpopup.cpp \ gui/beingpopup.h \ - gui/buydialog.cpp \ - gui/buydialog.h \ - gui/buyselldialog.cpp \ - gui/buyselldialog.h \ - gui/changeemaildialog.cpp \ - gui/changeemaildialog.h \ - gui/changepassworddialog.cpp \ - gui/changepassworddialog.h \ - gui/charselectdialog.cpp \ - gui/charselectdialog.h \ - gui/charcreatedialog.cpp \ - gui/charcreatedialog.h \ - gui/chatwindow.cpp \ - gui/chatwindow.h \ - gui/confirmdialog.cpp \ - gui/confirmdialog.h \ - gui/connectiondialog.cpp \ - gui/connectiondialog.h \ - gui/debugwindow.cpp \ - gui/debugwindow.h \ - gui/didyouknowwindow.cpp \ - gui/didyouknowwindow.h \ - gui/editserverdialog.cpp \ - gui/editserverdialog.h \ - gui/emotewindow.cpp \ - gui/emotewindow.h \ - gui/equipmentwindow.cpp \ - gui/equipmentwindow.h \ + gui/windows/buydialog.cpp \ + gui/windows/buydialog.h \ + gui/windows/buyselldialog.cpp \ + gui/windows/buyselldialog.h \ + gui/windows/changeemaildialog.cpp \ + gui/windows/changeemaildialog.h \ + gui/windows/changepassworddialog.cpp \ + gui/windows/changepassworddialog.h \ + gui/windows/charselectdialog.cpp \ + gui/windows/charselectdialog.h \ + gui/windows/charcreatedialog.cpp \ + gui/windows/charcreatedialog.h \ + gui/windows/chatwindow.cpp \ + gui/windows/chatwindow.h \ + gui/windows/confirmdialog.cpp \ + gui/windows/confirmdialog.h \ + gui/windows/connectiondialog.cpp \ + gui/windows/connectiondialog.h \ + gui/windows/debugwindow.cpp \ + gui/windows/debugwindow.h \ + gui/windows/didyouknowwindow.cpp \ + gui/windows/didyouknowwindow.h \ + gui/windows/editdialog.cpp \ + gui/windows/editdialog.h \ + gui/windows/editserverdialog.cpp \ + gui/windows/editserverdialog.h \ + gui/windows/emotewindow.cpp \ + gui/windows/emotewindow.h \ + gui/windows/equipmentwindow.cpp \ + gui/windows/equipmentwindow.h \ gui/focushandler.cpp \ gui/focushandler.h \ gui/gui.cpp \ gui/gui.h \ - gui/helpwindow.cpp \ - gui/helpwindow.h \ - gui/inventorywindow.cpp \ - gui/inventorywindow.h \ - gui/itemamountwindow.cpp \ - gui/itemamountwindow.h \ + gui/windows/helpwindow.cpp \ + gui/windows/helpwindow.h \ + gui/windows/inventorywindow.cpp \ + gui/windows/inventorywindow.h \ + gui/windows/itemamountwindow.cpp \ + gui/windows/itemamountwindow.h \ gui/itempopup.cpp \ gui/itempopup.h \ gui/spellpopup.cpp \ gui/spellpopup.h \ gui/statuspopup.cpp \ gui/statuspopup.h \ - gui/killstats.cpp \ - gui/killstats.h \ - gui/logindialog.cpp \ - gui/logindialog.h \ - gui/minimap.cpp \ - gui/minimap.h \ - gui/ministatuswindow.cpp \ - gui/ministatuswindow.h \ - gui/npcdialog.cpp \ - gui/npcdialog.h \ - gui/npcpostdialog.cpp \ - gui/npcpostdialog.h \ - gui/okdialog.cpp \ - gui/okdialog.h \ - gui/editdialog.cpp \ - gui/editdialog.h \ - gui/outfitwindow.cpp \ - gui/outfitwindow.h \ - gui/botcheckerwindow.cpp \ - gui/botcheckerwindow.h \ - gui/textcommandeditor.cpp \ - gui/textcommandeditor.h \ + gui/windows/killstats.cpp \ + gui/windows/killstats.h \ + gui/windows/logindialog.cpp \ + gui/windows/logindialog.h \ + gui/windows/minimap.cpp \ + gui/windows/minimap.h \ + gui/windows/ministatuswindow.cpp \ + gui/windows/ministatuswindow.h \ + gui/windows/npcdialog.cpp \ + gui/windows/npcdialog.h \ + gui/windows/npcpostdialog.cpp \ + gui/windows/npcpostdialog.h \ + gui/windows/okdialog.cpp \ + gui/windows/okdialog.h \ + gui/windows/outfitwindow.cpp \ + gui/windows/outfitwindow.h \ + gui/windows/botcheckerwindow.cpp \ + gui/windows/botcheckerwindow.h \ + gui/windows/textcommandeditor.cpp \ + gui/windows/textcommandeditor.h \ gui/palette.cpp \ gui/palette.h \ gui/popupmenu.cpp \ gui/popupmenu.h \ - gui/questswindow.cpp \ - gui/questswindow.h \ - gui/quitdialog.cpp \ - gui/quitdialog.h \ - gui/registerdialog.cpp \ - gui/registerdialog.h \ + gui/windows/questswindow.cpp \ + gui/windows/questswindow.h \ + gui/windows/quitdialog.cpp \ + gui/windows/quitdialog.h \ + gui/windows/registerdialog.cpp \ + gui/windows/registerdialog.h \ gui/sdlinput.cpp \ gui/sdlinput.h \ - gui/selldialog.cpp \ - gui/selldialog.h \ - gui/serverdialog.cpp \ - gui/serverdialog.h \ - gui/setup.cpp \ - gui/setup.h \ + gui/windows/selldialog.cpp \ + gui/windows/selldialog.h \ + gui/windows/serverdialog.cpp \ + gui/windows/serverdialog.h \ + gui/windows/setup.cpp \ + gui/windows/setup.h \ gui/setup_audio.cpp \ gui/setup_audio.h \ gui/setup_colors.cpp \ @@ -375,40 +375,40 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/setupactiondata.h \ gui/sdlfont.cpp \ gui/sdlfont.h \ - gui/shopwindow.cpp \ - gui/shopwindow.h \ - gui/shortcutwindow.cpp \ - gui/shortcutwindow.h \ - gui/skilldialog.cpp \ - gui/skilldialog.h \ - gui/socialwindow.cpp \ - gui/socialwindow.h \ + gui/windows/shopwindow.cpp \ + gui/windows/shopwindow.h \ + gui/windows/shortcutwindow.cpp \ + gui/windows/shortcutwindow.h \ + gui/windows/skilldialog.cpp \ + gui/windows/skilldialog.h \ + gui/windows/socialwindow.cpp \ + gui/windows/socialwindow.h \ gui/speechbubble.cpp \ gui/speechbubble.h \ - gui/statuswindow.cpp \ - gui/statuswindow.h \ - gui/textdialog.cpp \ - gui/textdialog.h \ + gui/windows/statuswindow.cpp \ + gui/windows/statuswindow.h \ + gui/windows/textdialog.cpp \ + gui/windows/textdialog.h \ gui/textpopup.cpp \ gui/textpopup.h \ gui/theme.cpp \ gui/theme.h \ - gui/tradewindow.cpp \ - gui/tradewindow.h \ - gui/unregisterdialog.cpp \ - gui/unregisterdialog.h \ - gui/updaterwindow.cpp \ - gui/updaterwindow.h \ + gui/windows/tradewindow.cpp \ + gui/windows/tradewindow.h \ + gui/windows/unregisterdialog.cpp \ + gui/windows/unregisterdialog.h \ + gui/windows/updaterwindow.cpp \ + gui/windows/updaterwindow.h \ gui/userpalette.cpp \ gui/userpalette.h \ gui/viewport.cpp \ gui/viewport.h \ - gui/whoisonline.cpp \ - gui/whoisonline.h \ + gui/windows/whoisonline.cpp \ + gui/windows/whoisonline.h \ gui/windowmenu.cpp \ gui/windowmenu.h \ - gui/worldselectdialog.cpp \ - gui/worldselectdialog.h \ + gui/windows/worldselectdialog.cpp \ + gui/windows/worldselectdialog.h \ net/adminhandler.h \ net/beinghandler.h \ net/buysellhandler.h \ diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp index eb2501b53..a675c6d42 100644 --- a/src/actionmanager.cpp +++ b/src/actionmanager.cpp @@ -34,29 +34,31 @@ #include "input/inputevent.h" #include "input/inputmanager.h" -#include "gui/botcheckerwindow.h" -#include "gui/buyselldialog.h" -#include "gui/chatwindow.h" -#include "gui/debugwindow.h" -#include "gui/didyouknowwindow.h" -#include "gui/equipmentwindow.h" -#include "gui/helpwindow.h" -#include "gui/inventorywindow.h" -#include "gui/killstats.h" -#include "gui/minimap.h" -#include "gui/ministatuswindow.h" -#include "gui/npcdialog.h" -#include "gui/outfitwindow.h" -#include "gui/setup.h" -#include "gui/shopwindow.h" -#include "gui/shortcutwindow.h" -#include "gui/skilldialog.h" -#include "gui/socialwindow.h" -#include "gui/statuswindow.h" #include "gui/viewport.h" -#include "gui/questswindow.h" -#include "gui/quitdialog.h" -#include "gui/whoisonline.h" + +#include "gui/windows/skilldialog.h" +#include "gui/windows/socialwindow.h" +#include "gui/windows/statuswindow.h" +#include "gui/windows/questswindow.h" +#include "gui/windows/quitdialog.h" +#include "gui/windows/whoisonline.h" + +#include "gui/windows/botcheckerwindow.h" +#include "gui/windows/buyselldialog.h" +#include "gui/windows/chatwindow.h" +#include "gui/windows/debugwindow.h" +#include "gui/windows/didyouknowwindow.h" +#include "gui/windows/equipmentwindow.h" +#include "gui/windows/helpwindow.h" +#include "gui/windows/inventorywindow.h" +#include "gui/windows/killstats.h" +#include "gui/windows/minimap.h" +#include "gui/windows/ministatuswindow.h" +#include "gui/windows/npcdialog.h" +#include "gui/windows/outfitwindow.h" +#include "gui/windows/setup.h" +#include "gui/windows/shopwindow.h" +#include "gui/windows/shortcutwindow.h" #include "gui/widgets/chattab.h" diff --git a/src/actorspritemanager.cpp b/src/actorspritemanager.cpp index f4446cb85..2996d7167 100644 --- a/src/actorspritemanager.cpp +++ b/src/actorspritemanager.cpp @@ -30,12 +30,12 @@ #include "being/playerinfo.h" #include "being/playerrelations.h" -#include "gui/chatwindow.h" -#include "gui/equipmentwindow.h" -#include "gui/socialwindow.h" #include "gui/viewport.h" #include "gui/widgets/chattab.h" +#include "gui/windows/chatwindow.h" +#include "gui/windows/equipmentwindow.h" +#include "gui/windows/socialwindow.h" #include "utils/checkutils.h" #include "utils/gettext.h" diff --git a/src/being/being.cpp b/src/being/being.cpp index 949a691c1..07cac90c1 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -38,11 +38,12 @@ #include "particle/particle.h" -#include "gui/equipmentwindow.h" -#include "gui/socialwindow.h" #include "gui/speechbubble.h" #include "gui/sdlfont.h" -#include "gui/skilldialog.h" + +#include "gui/windows/equipmentwindow.h" +#include "gui/windows/skilldialog.h" +#include "gui/windows/socialwindow.h" #include "net/charserverhandler.h" #include "net/gamehandler.h" diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index f8a13f8a0..2c7724d26 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -42,18 +42,19 @@ #include "input/keyboardconfig.h" -#include "gui/chatwindow.h" #include "gui/gui.h" -#include "gui/ministatuswindow.h" -#include "gui/okdialog.h" -#include "gui/outfitwindow.h" -#include "gui/shopwindow.h" #include "gui/sdlfont.h" -#include "gui/skilldialog.h" -#include "gui/socialwindow.h" -#include "gui/updaterwindow.h" #include "gui/viewport.h" +#include "gui/windows/chatwindow.h" +#include "gui/windows/ministatuswindow.h" +#include "gui/windows/okdialog.h" +#include "gui/windows/outfitwindow.h" +#include "gui/windows/shopwindow.h" +#include "gui/windows/skilldialog.h" +#include "gui/windows/socialwindow.h" +#include "gui/windows/updaterwindow.h" + #include "gui/widgets/gmtab.h" #include "gui/widgets/whispertab.h" diff --git a/src/being/playerinfo.cpp b/src/being/playerinfo.cpp index 5b94c0018..be9087b77 100644 --- a/src/being/playerinfo.cpp +++ b/src/being/playerinfo.cpp @@ -26,9 +26,9 @@ #include "depricatedevent.h" #include "inventory.h" -#include "gui/inventorywindow.h" -#include "gui/npcdialog.h" -#include "gui/npcpostdialog.h" +#include "gui/windows/inventorywindow.h" +#include "gui/windows/npcdialog.h" +#include "gui/windows/npcpostdialog.h" #include "resources/iteminfo.h" diff --git a/src/client.cpp b/src/client.cpp index a14e36198..fb58c313a 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -47,28 +47,29 @@ #include "input/joystick.h" #include "input/keyboardconfig.h" -#include "gui/buydialog.h" -#include "gui/buyselldialog.h" -#include "gui/changeemaildialog.h" -#include "gui/changepassworddialog.h" -#include "gui/charselectdialog.h" -#include "gui/confirmdialog.h" -#include "gui/connectiondialog.h" -#include "gui/didyouknowwindow.h" #include "gui/gui.h" -#include "gui/helpwindow.h" -#include "gui/logindialog.h" -#include "gui/okdialog.h" -#include "gui/quitdialog.h" -#include "gui/registerdialog.h" -#include "gui/npcdialog.h" -#include "gui/selldialog.h" -#include "gui/serverdialog.h" -#include "gui/setup.h" #include "gui/theme.h" -#include "gui/unregisterdialog.h" -#include "gui/updaterwindow.h" -#include "gui/worldselectdialog.h" + +#include "gui/windows/buyselldialog.h" +#include "gui/windows/buydialog.h" +#include "gui/windows/changeemaildialog.h" +#include "gui/windows/changepassworddialog.h" +#include "gui/windows/charselectdialog.h" +#include "gui/windows/confirmdialog.h" +#include "gui/windows/connectiondialog.h" +#include "gui/windows/didyouknowwindow.h" +#include "gui/windows/helpwindow.h" +#include "gui/windows/logindialog.h" +#include "gui/windows/npcdialog.h" +#include "gui/windows/okdialog.h" +#include "gui/windows/registerdialog.h" +#include "gui/windows/selldialog.h" +#include "gui/windows/serverdialog.h" +#include "gui/windows/setup.h" +#include "gui/windows/unregisterdialog.h" +#include "gui/windows/updaterwindow.h" +#include "gui/windows/quitdialog.h" +#include "gui/windows/worldselectdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/desktop.h" diff --git a/src/commands.cpp b/src/commands.cpp index fc033cd83..522aabcb3 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -34,14 +34,15 @@ #include "being/localplayer.h" #include "being/playerrelations.h" -#include "gui/buydialog.h" -#include "gui/chatwindow.h" -#include "gui/helpwindow.h" #include "gui/gui.h" -#include "gui/outfitwindow.h" -#include "gui/shopwindow.h" -#include "gui/socialwindow.h" -#include "gui/tradewindow.h" + +#include "gui/windows/buydialog.h" +#include "gui/windows/chatwindow.h" +#include "gui/windows/helpwindow.h" +#include "gui/windows/outfitwindow.h" +#include "gui/windows/shopwindow.h" +#include "gui/windows/socialwindow.h" +#include "gui/windows/tradewindow.h" #include "gui/widgets/whispertab.h" diff --git a/src/game.cpp b/src/game.cpp index 6bae44e49..2cd541acb 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -47,33 +47,34 @@ #include "input/joystick.h" #include "input/keyboardconfig.h" -#include "gui/botcheckerwindow.h" -#include "gui/debugwindow.h" -#include "gui/didyouknowwindow.h" -#include "gui/emotewindow.h" -#include "gui/equipmentwindow.h" #include "gui/gui.h" -#include "gui/helpwindow.h" -#include "gui/inventorywindow.h" -#include "gui/killstats.h" -#include "gui/minimap.h" -#include "gui/ministatuswindow.h" -#include "gui/okdialog.h" -#include "gui/outfitwindow.h" -#include "gui/setup.h" -#include "gui/shopwindow.h" -#include "gui/shortcutwindow.h" -#include "gui/socialwindow.h" #ifdef MANASERV_SUPPORT #include "gui/specialswindow.h" #endif -#include "gui/skilldialog.h" -#include "gui/statuswindow.h" -#include "gui/tradewindow.h" #include "gui/viewport.h" -#include "gui/questswindow.h" #include "gui/windowmenu.h" -#include "gui/whoisonline.h" + +#include "gui/windows/botcheckerwindow.h" +#include "gui/windows/debugwindow.h" +#include "gui/windows/didyouknowwindow.h" +#include "gui/windows/emotewindow.h" +#include "gui/windows/equipmentwindow.h" +#include "gui/windows/helpwindow.h" +#include "gui/windows/inventorywindow.h" +#include "gui/windows/killstats.h" +#include "gui/windows/minimap.h" +#include "gui/windows/ministatuswindow.h" +#include "gui/windows/okdialog.h" +#include "gui/windows/outfitwindow.h" +#include "gui/windows/setup.h" +#include "gui/windows/shopwindow.h" +#include "gui/windows/shortcutwindow.h" +#include "gui/windows/skilldialog.h" +#include "gui/windows/socialwindow.h" +#include "gui/windows/statuswindow.h" +#include "gui/windows/tradewindow.h" +#include "gui/windows/questswindow.h" +#include "gui/windows/whoisonline.h" #include "gui/widgets/battletab.h" #include "gui/widgets/dropshortcutcontainer.h" diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index fc16b7e36..62f769378 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -40,21 +40,22 @@ #include "input/inputmanager.h" -#include "gui/chatwindow.h" -#include "gui/equipmentwindow.h" -#include "gui/inventorywindow.h" -#include "gui/itemamountwindow.h" -#include "gui/ministatuswindow.h" -#include "gui/npcdialog.h" -#include "gui/outfitwindow.h" -#include "gui/skilldialog.h" -#include "gui/socialwindow.h" -#include "gui/textcommandeditor.h" -#include "gui/textdialog.h" -#include "gui/tradewindow.h" -#include "gui/viewport.h" +#include "gui/windows/chatwindow.h" +#include "gui/windows/equipmentwindow.h" +#include "gui/windows/inventorywindow.h" +#include "gui/windows/itemamountwindow.h" +#include "gui/windows/ministatuswindow.h" +#include "gui/windows/npcdialog.h" +#include "gui/windows/outfitwindow.h" +#include "gui/windows/skilldialog.h" +#include "gui/windows/socialwindow.h" +#include "gui/windows/textcommandeditor.h" +#include "gui/windows/textdialog.h" +#include "gui/windows/tradewindow.h" #include "gui/windowmenu.h" +#include "gui/viewport.h" + #include "gui/widgets/browserbox.h" #include "gui/widgets/chattab.h" #include "gui/widgets/progressbar.h" diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp index cf2958e4d..4874e4291 100644 --- a/src/gui/setup_chat.cpp +++ b/src/gui/setup_chat.cpp @@ -22,7 +22,7 @@ #include "gui/setup_chat.h" -#include "gui/chatwindow.h" +#include "gui/windows/chatwindow.h" #include "gui/widgets/layouthelper.h" #include "gui/widgets/scrollarea.h" diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp index 3873c2dd3..423dce947 100644 --- a/src/gui/setup_input.cpp +++ b/src/gui/setup_input.cpp @@ -28,9 +28,10 @@ #include "input/inputmanager.h" #include "input/keyboardconfig.h" -#include "gui/okdialog.h" #include "gui/setupactiondata.h" +#include "gui/windows/okdialog.h" + #include "gui/widgets/button.h" #include "gui/widgets/layouthelper.h" #include "gui/widgets/listbox.h" diff --git a/src/gui/setup_theme.cpp b/src/gui/setup_theme.cpp index ca38a76d8..029bc07f1 100644 --- a/src/gui/setup_theme.cpp +++ b/src/gui/setup_theme.cpp @@ -23,7 +23,8 @@ #include "gui/setup_theme.h" #include "gui/gui.h" -#include "gui/okdialog.h" + +#include "gui/windows/okdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/dropdown.h" diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index 881aa69d4..34e17a1c6 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -27,8 +27,8 @@ #include "graphicsmanager.h" -#include "gui/okdialog.h" -#include "gui/textdialog.h" +#include "gui/windows/okdialog.h" +#include "gui/windows/textdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/checkbox.h" diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 61b5f5f6d..1aa5e1d9b 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -36,10 +36,11 @@ #include "gui/beingpopup.h" #include "gui/gui.h" -#include "gui/ministatuswindow.h" #include "gui/popupmenu.h" #include "gui/textpopup.h" +#include "gui/windows/ministatuswindow.h" + #include <guichan/font.hpp> #include "debug.h" diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index 8b65928a8..76b5ccfc4 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -28,11 +28,12 @@ #include "being/localplayer.h" -#include "gui/chatwindow.h" #include "gui/gui.h" #include "gui/sdlfont.h" #include "gui/viewport.h" +#include "gui/windows/chatwindow.h" + #include "resources/image.h" #include <guichan/font.hpp> diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp index 65812ba4b..c8a38337f 100644 --- a/src/gui/widgets/characterdisplay.cpp +++ b/src/gui/widgets/characterdisplay.cpp @@ -24,7 +24,8 @@ #include "units.h" -#include "gui/charselectdialog.h" +#include "gui/windows/charselectdialog.h" + #include "gui/textpopup.h" #include "gui/widgets/label.h" diff --git a/src/gui/widgets/characterviewbase.h b/src/gui/widgets/characterviewbase.h index 8ef949b7c..21e20e37d 100644 --- a/src/gui/widgets/characterviewbase.h +++ b/src/gui/widgets/characterviewbase.h @@ -21,7 +21,7 @@ #ifndef GUI_WIDGETS_CHARACTERVIEWBASE_H #define GUI_WIDGETS_CHARACTERVIEWBASE_H -#include "gui/charselectdialog.h" +#include "gui/windows/charselectdialog.h" #include "gui/widgets/container.h" diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index aba79034f..e863643d3 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -31,7 +31,7 @@ #include "being/localplayer.h" -#include "gui/helpwindow.h" +#include "gui/windows/helpwindow.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/itemlinkhandler.h" diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h index c2ac5a45b..07192ab6b 100644 --- a/src/gui/widgets/chattab.h +++ b/src/gui/widgets/chattab.h @@ -23,7 +23,7 @@ #ifndef GUI_WIDGETS_CHATTAB_H #define GUI_WIDGETS_CHATTAB_H -#include "gui/chatwindow.h" +#include "gui/windows/chatwindow.h" #include "gui/widgets/browserbox.h" #include "gui/widgets/tab.h" diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp index 115fcb192..c040d4c3a 100644 --- a/src/gui/widgets/dropshortcutcontainer.cpp +++ b/src/gui/widgets/dropshortcutcontainer.cpp @@ -28,10 +28,11 @@ #include "being/playerinfo.h" -#include "gui/inventorywindow.h" #include "gui/itempopup.h" #include "gui/viewport.h" +#include "gui/windows/inventorywindow.h" + #include "resources/image.h" #include <guichan/font.hpp> diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 0def0ad9e..64cafcd82 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -29,13 +29,14 @@ #include "being/playerinfo.h" -#include "gui/chatwindow.h" #include "gui/gui.h" #include "gui/itempopup.h" -#include "gui/shopwindow.h" -#include "gui/shortcutwindow.h" #include "gui/viewport.h" +#include "gui/windows/chatwindow.h" +#include "gui/windows/shopwindow.h" +#include "gui/windows/shortcutwindow.h" + #include "net/net.h" #include "net/inventoryhandler.h" #include "net/tradehandler.h" diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index fd70e2032..0dff139f6 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -22,11 +22,12 @@ #include "gui/widgets/itemlinkhandler.h" -#include "gui/confirmdialog.h" -#include "gui/helpwindow.h" #include "gui/itempopup.h" #include "gui/viewport.h" +#include "gui/windows/confirmdialog.h" +#include "gui/windows/helpwindow.h" + #include "utils/gettext.h" #include "utils/process.h" #include "utils/stringutils.h" diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 3334a42e5..e2901c3bb 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -33,12 +33,13 @@ #include "input/inputmanager.h" -#include "gui/inventorywindow.h" #include "gui/itempopup.h" -#include "gui/skilldialog.h" #include "gui/spellpopup.h" #include "gui/viewport.h" +#include "gui/windows/inventorywindow.h" +#include "gui/windows/skilldialog.h" + #include "gui/widgets/skillinfo.h" #include "resources/image.h" diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 652a1402b..0cbfd1a5e 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -24,10 +24,11 @@ #include "main.h" #include "soundmanager.h" -#include "gui/editdialog.h" #include "gui/gui.h" #include "gui/sdlfont.h" +#include "gui/windows/editdialog.h" + #include "gui/widgets/checkbox.h" #include "gui/widgets/dropdown.h" #include "gui/widgets/horizontcontainer.h" diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp index cf3fc937b..8e77d3215 100644 --- a/src/gui/widgets/spellshortcutcontainer.cpp +++ b/src/gui/widgets/spellshortcutcontainer.cpp @@ -27,11 +27,12 @@ #include "itemshortcut.h" #include "spellshortcut.h" -#include "gui/inventorywindow.h" -#include "gui/shortcutwindow.h" #include "gui/spellpopup.h" #include "gui/viewport.h" +#include "gui/windows/inventorywindow.h" +#include "gui/windows/shortcutwindow.h" + #include "resources/image.h" #include <guichan/font.hpp> diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 39674e860..46b905045 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -26,12 +26,13 @@ #include "input/inputmanager.h" -#include "gui/skilldialog.h" +#include "gui/textpopup.h" +#include "gui/viewport.h" + +#include "gui/windows/skilldialog.h" #ifdef MANASERV_SUPPORT #include "gui/specialswindow.h" #endif -#include "gui/textpopup.h" -#include "gui/viewport.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/windows/botcheckerwindow.cpp index 58321b12f..f51683b40 100644 --- a/src/gui/botcheckerwindow.cpp +++ b/src/gui/windows/botcheckerwindow.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/botcheckerwindow.h" +#include "gui/windows/botcheckerwindow.h" #include "gui/widgets/button.h" #include "gui/widgets/scrollarea.h" diff --git a/src/gui/botcheckerwindow.h b/src/gui/windows/botcheckerwindow.h index fbe53cf82..fbe53cf82 100644 --- a/src/gui/botcheckerwindow.h +++ b/src/gui/windows/botcheckerwindow.h diff --git a/src/gui/buydialog.cpp b/src/gui/windows/buydialog.cpp index 309a2922c..44b143e50 100644 --- a/src/gui/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -20,12 +20,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/buydialog.h" +#include "gui/windows/buydialog.h" #include "shopitem.h" #include "units.h" -#include "gui/tradewindow.h" +#include "gui/windows/tradewindow.h" #include "gui/widgets/button.h" #include "gui/widgets/dropdown.h" diff --git a/src/gui/buydialog.h b/src/gui/windows/buydialog.h index 875184851..875184851 100644 --- a/src/gui/buydialog.h +++ b/src/gui/windows/buydialog.h diff --git a/src/gui/buyselldialog.cpp b/src/gui/windows/buyselldialog.cpp index 13de9c440..d26b0ceb8 100644 --- a/src/gui/buyselldialog.cpp +++ b/src/gui/windows/buyselldialog.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/buyselldialog.h" +#include "gui/windows/buyselldialog.h" #include "net/buysellhandler.h" #include "net/net.h" diff --git a/src/gui/buyselldialog.h b/src/gui/windows/buyselldialog.h index 193364ff8..193364ff8 100644 --- a/src/gui/buyselldialog.h +++ b/src/gui/windows/buyselldialog.h diff --git a/src/gui/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp index cd10b8dfa..61ff7ef3d 100644 --- a/src/gui/changeemaildialog.cpp +++ b/src/gui/windows/changeemaildialog.cpp @@ -20,12 +20,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/changeemaildialog.h" +#include "gui/windows/changeemaildialog.h" #include "client.h" -#include "gui/registerdialog.h" -#include "gui/okdialog.h" +#include "gui/windows/registerdialog.h" +#include "gui/windows/okdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/label.h" diff --git a/src/gui/changeemaildialog.h b/src/gui/windows/changeemaildialog.h index e61ac8bc5..e61ac8bc5 100644 --- a/src/gui/changeemaildialog.h +++ b/src/gui/windows/changeemaildialog.h diff --git a/src/gui/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp index 3f41df3c5..365ee19a8 100644 --- a/src/gui/changepassworddialog.cpp +++ b/src/gui/windows/changepassworddialog.cpp @@ -20,12 +20,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/changepassworddialog.h" +#include "gui/windows/changepassworddialog.h" #include "client.h" -#include "gui/registerdialog.h" -#include "gui/okdialog.h" +#include "gui/windows/registerdialog.h" +#include "gui/windows/okdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/passwordfield.h" diff --git a/src/gui/changepassworddialog.h b/src/gui/windows/changepassworddialog.h index fd70348a6..fd70348a6 100644 --- a/src/gui/changepassworddialog.h +++ b/src/gui/windows/changepassworddialog.h diff --git a/src/gui/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index fbcabe3c3..53f1a5bce 100644 --- a/src/gui/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -20,14 +20,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/charcreatedialog.h" +#include "gui/windows/charcreatedialog.h" #include "main.h" #include "input/keydata.h" #include "input/keyevent.h" -#include "gui/okdialog.h" +#include "gui/windows/okdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/label.h" diff --git a/src/gui/charcreatedialog.h b/src/gui/windows/charcreatedialog.h index 207ac557d..7bb96284e 100644 --- a/src/gui/charcreatedialog.h +++ b/src/gui/windows/charcreatedialog.h @@ -25,7 +25,7 @@ #include "being/being.h" -#include "gui/charselectdialog.h" +#include "gui/windows/charselectdialog.h" #include <guichan/actionlistener.hpp> #include <guichan/keylistener.hpp> diff --git a/src/gui/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 1ab2bd0b0..f34f53d28 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/charselectdialog.h" +#include "gui/windows/charselectdialog.h" #include "client.h" #include "configuration.h" @@ -29,11 +29,11 @@ #include "input/keydata.h" #include "input/keyevent.h" -#include "gui/charcreatedialog.h" -#include "gui/confirmdialog.h" -#include "gui/logindialog.h" -#include "gui/okdialog.h" -#include "gui/textdialog.h" +#include "gui/windows/charcreatedialog.h" +#include "gui/windows/confirmdialog.h" +#include "gui/windows/logindialog.h" +#include "gui/windows/okdialog.h" +#include "gui/windows/textdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/characterdisplay.h" diff --git a/src/gui/charselectdialog.h b/src/gui/windows/charselectdialog.h index 9556ba633..9556ba633 100644 --- a/src/gui/charselectdialog.h +++ b/src/gui/windows/charselectdialog.h diff --git a/src/gui/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 1f3ff51bb..61f42a824 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/chatwindow.h" +#include "gui/windows/chatwindow.h" #include "actorspritemanager.h" #include "client.h" @@ -38,13 +38,14 @@ #include "input/inputmanager.h" #include "input/keyevent.h" -#include "gui/emotewindow.h" #include "gui/gui.h" -#include "gui/setup.h" #include "gui/sdlfont.h" #include "gui/sdlinput.h" #include "gui/viewport.h" -#include "gui/whoisonline.h" + +#include "gui/windows/emotewindow.h" +#include "gui/windows/setup.h" +#include "gui/windows/whoisonline.h" #include "gui/widgets/battletab.h" #include "gui/widgets/dropdown.h" diff --git a/src/gui/chatwindow.h b/src/gui/windows/chatwindow.h index 7137af08f..7137af08f 100644 --- a/src/gui/chatwindow.h +++ b/src/gui/windows/chatwindow.h diff --git a/src/gui/confirmdialog.cpp b/src/gui/windows/confirmdialog.cpp index 08ef09d64..34c54582c 100644 --- a/src/gui/confirmdialog.cpp +++ b/src/gui/windows/confirmdialog.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/confirmdialog.h" +#include "gui/windows/confirmdialog.h" #include "soundmanager.h" diff --git a/src/gui/confirmdialog.h b/src/gui/windows/confirmdialog.h index 76e3c2d18..76e3c2d18 100644 --- a/src/gui/confirmdialog.h +++ b/src/gui/windows/confirmdialog.h diff --git a/src/gui/connectiondialog.cpp b/src/gui/windows/connectiondialog.cpp index 97894492f..cb03b5bbc 100644 --- a/src/gui/connectiondialog.cpp +++ b/src/gui/windows/connectiondialog.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/connectiondialog.h" +#include "gui/windows/connectiondialog.h" #include "gui/widgets/button.h" #include "gui/widgets/label.h" diff --git a/src/gui/connectiondialog.h b/src/gui/windows/connectiondialog.h index 21f29712c..21f29712c 100644 --- a/src/gui/connectiondialog.h +++ b/src/gui/windows/connectiondialog.h diff --git a/src/gui/debugwindow.cpp b/src/gui/windows/debugwindow.cpp index 39f07dffb..0104af792 100644 --- a/src/gui/debugwindow.cpp +++ b/src/gui/windows/debugwindow.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/debugwindow.h" +#include "gui/windows/debugwindow.h" #include "client.h" #include "game.h" @@ -30,9 +30,10 @@ #include "particle/particle.h" -#include "gui/setup.h" #include "gui/viewport.h" +#include "gui/windows/setup.h" + #include "gui/widgets/label.h" #include "gui/widgets/layout.h" #include "gui/widgets/layouthelper.h" diff --git a/src/gui/debugwindow.h b/src/gui/windows/debugwindow.h index ef67df432..ef67df432 100644 --- a/src/gui/debugwindow.h +++ b/src/gui/windows/debugwindow.h diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/windows/didyouknowwindow.cpp index 68ecfdfd3..8c900d119 100644 --- a/src/gui/didyouknowwindow.cpp +++ b/src/gui/windows/didyouknowwindow.cpp @@ -20,13 +20,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/didyouknowwindow.h" +#include "gui/windows/didyouknowwindow.h" #include "configuration.h" #include "gui/gui.h" #include "gui/sdlfont.h" -#include "gui/setup.h" + +#include "gui/windows/setup.h" #include "gui/widgets/button.h" #include "gui/widgets/browserbox.h" diff --git a/src/gui/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h index 49cb07a8b..49cb07a8b 100644 --- a/src/gui/didyouknowwindow.h +++ b/src/gui/windows/didyouknowwindow.h diff --git a/src/gui/editdialog.cpp b/src/gui/windows/editdialog.cpp index fa6b1e123..acd5d9f72 100644 --- a/src/gui/editdialog.cpp +++ b/src/gui/windows/editdialog.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/editdialog.h" +#include "gui/windows/editdialog.h" #include "gui/widgets/button.h" diff --git a/src/gui/editdialog.h b/src/gui/windows/editdialog.h index 6d3d191bc..6d3d191bc 100644 --- a/src/gui/editdialog.h +++ b/src/gui/windows/editdialog.h diff --git a/src/gui/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp index ff1d42eea..2a6814525 100644 --- a/src/gui/editserverdialog.cpp +++ b/src/gui/windows/editserverdialog.cpp @@ -19,13 +19,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/editserverdialog.h" +#include "gui/windows/editserverdialog.h" #include "input/keydata.h" #include "input/keyevent.h" -#include "gui/okdialog.h" -#include "gui/serverdialog.h" +#include "gui/windows/okdialog.h" +#include "gui/windows/serverdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/dropdown.h" diff --git a/src/gui/editserverdialog.h b/src/gui/windows/editserverdialog.h index 531bb009a..531bb009a 100644 --- a/src/gui/editserverdialog.h +++ b/src/gui/windows/editserverdialog.h diff --git a/src/gui/emotewindow.cpp b/src/gui/windows/emotewindow.cpp index 848c1e88f..cdff2d31d 100644 --- a/src/gui/emotewindow.cpp +++ b/src/gui/windows/emotewindow.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/emotewindow.h" +#include "gui/windows/emotewindow.h" #include "gui/widgets/colormodel.h" #include "gui/widgets/colorpage.h" diff --git a/src/gui/emotewindow.h b/src/gui/windows/emotewindow.h index b65c0c13c..b65c0c13c 100644 --- a/src/gui/emotewindow.h +++ b/src/gui/windows/emotewindow.h diff --git a/src/gui/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index 9e4438393..0402115df 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/equipmentwindow.h" +#include "gui/windows/equipmentwindow.h" #include "configuration.h" #include "dragdrop.h" @@ -33,9 +33,10 @@ #include "being/playerinfo.h" #include "gui/itempopup.h" -#include "gui/setup.h" #include "gui/viewport.h" +#include "gui/windows/setup.h" + #include "gui/widgets/button.h" #include "gui/widgets/playerbox.h" diff --git a/src/gui/equipmentwindow.h b/src/gui/windows/equipmentwindow.h index 5fd69c23a..5fd69c23a 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/windows/equipmentwindow.h diff --git a/src/gui/helpwindow.cpp b/src/gui/windows/helpwindow.cpp index 2f6eb5366..db85ea0bd 100644 --- a/src/gui/helpwindow.cpp +++ b/src/gui/windows/helpwindow.cpp @@ -20,14 +20,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/helpwindow.h" +#include "gui/windows/helpwindow.h" #include "configuration.h" -#include "gui/didyouknowwindow.h" #include "gui/gui.h" #include "gui/sdlfont.h" -#include "gui/setup.h" + +#include "gui/windows/didyouknowwindow.h" +#include "gui/windows/setup.h" #include "gui/widgets/button.h" #include "gui/widgets/browserbox.h" diff --git a/src/gui/helpwindow.h b/src/gui/windows/helpwindow.h index 1419e0a10..1419e0a10 100644 --- a/src/gui/helpwindow.h +++ b/src/gui/windows/helpwindow.h diff --git a/src/gui/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index d36c52e61..b57a7ea21 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/inventorywindow.h" +#include "gui/windows/inventorywindow.h" #include "configuration.h" #include "item.h" @@ -31,16 +31,18 @@ #include "input/inputmanager.h" #include "input/keyevent.h" -#include "gui/equipmentwindow.h" #include "gui/gui.h" -#include "gui/itemamountwindow.h" -#include "gui/outfitwindow.h" -#include "gui/setup.h" -#include "gui/shopwindow.h" #include "gui/textpopup.h" -#include "gui/tradewindow.h" #include "gui/viewport.h" +#include "gui/windows/equipmentwindow.h" +#include "gui/windows/itemamountwindow.h" +#include "gui/windows/outfitwindow.h" +#include "gui/windows/setup.h" +#include "gui/windows/shopwindow.h" +#include "gui/windows/tradewindow.h" + + #include "gui/widgets/button.h" #include "gui/widgets/dropdown.h" #include "gui/widgets/itemcontainer.h" diff --git a/src/gui/inventorywindow.h b/src/gui/windows/inventorywindow.h index 7bd4ce466..7bd4ce466 100644 --- a/src/gui/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h diff --git a/src/gui/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index 1fd15e351..7c67fb976 100644 --- a/src/gui/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -20,20 +20,21 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/itemamountwindow.h" +#include "gui/windows/itemamountwindow.h" #include "inventory.h" #include "item.h" #include "input/keyboardconfig.h" -#include "gui/tradewindow.h" #include "net/inventoryhandler.h" #include "gui/itempopup.h" #include "net/net.h" -#include "gui/shopwindow.h" #include "gui/viewport.h" +#include "gui/windows/shopwindow.h" +#include "gui/windows/tradewindow.h" + #include "gui/widgets/button.h" #include "gui/widgets/dropdown.h" #include "gui/widgets/icon.h" diff --git a/src/gui/itemamountwindow.h b/src/gui/windows/itemamountwindow.h index 1c95980fb..1c95980fb 100644 --- a/src/gui/itemamountwindow.h +++ b/src/gui/windows/itemamountwindow.h diff --git a/src/gui/killstats.cpp b/src/gui/windows/killstats.cpp index d289c1e27..ee265e2b9 100644 --- a/src/gui/killstats.cpp +++ b/src/gui/windows/killstats.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/killstats.h" +#include "gui/windows/killstats.h" #include "gui/widgets/button.h" #include "gui/widgets/label.h" diff --git a/src/gui/killstats.h b/src/gui/windows/killstats.h index a5b59affb..a5b59affb 100644 --- a/src/gui/killstats.h +++ b/src/gui/windows/killstats.h diff --git a/src/gui/logindialog.cpp b/src/gui/windows/logindialog.cpp index f3d43c31b..883c4606d 100644 --- a/src/gui/logindialog.cpp +++ b/src/gui/windows/logindialog.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/logindialog.h" +#include "gui/windows/logindialog.h" #include "client.h" #include "configuration.h" @@ -28,7 +28,7 @@ #include "input/keydata.h" #include "input/keyevent.h" -#include "gui/confirmdialog.h" +#include "gui/windows/confirmdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/checkbox.h" diff --git a/src/gui/logindialog.h b/src/gui/windows/logindialog.h index fee0d4016..fee0d4016 100644 --- a/src/gui/logindialog.h +++ b/src/gui/windows/logindialog.h diff --git a/src/gui/minimap.cpp b/src/gui/windows/minimap.cpp index 7164aa070..9adadd1e0 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/minimap.h" +#include "gui/windows/minimap.h" #include "actorspritemanager.h" #include "client.h" @@ -29,10 +29,11 @@ #include "being/localplayer.h" -#include "gui/setup.h" #include "gui/viewport.h" #include "gui/textpopup.h" +#include "gui/windows/setup.h" + #include "resources/image.h" #include "resources/imagehelper.h" #include "resources/resourcemanager.h" diff --git a/src/gui/minimap.h b/src/gui/windows/minimap.h index decacfec4..decacfec4 100644 --- a/src/gui/minimap.h +++ b/src/gui/windows/minimap.h diff --git a/src/gui/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp index 5ab8a2b57..21697b83f 100644 --- a/src/gui/ministatuswindow.cpp +++ b/src/gui/windows/ministatuswindow.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/ministatuswindow.h" +#include "gui/windows/ministatuswindow.h" #include "animatedsprite.h" #include "configuration.h" @@ -28,11 +28,12 @@ #include "being/localplayer.h" #include "being/playerinfo.h" -#include "gui/statuswindow.h" #include "gui/statuspopup.h" #include "gui/textpopup.h" #include "gui/viewport.h" +#include "gui/windows/statuswindow.h" + #include "gui/widgets/progressbar.h" #include "net/net.h" diff --git a/src/gui/ministatuswindow.h b/src/gui/windows/ministatuswindow.h index 39d1e689d..39d1e689d 100644 --- a/src/gui/ministatuswindow.h +++ b/src/gui/windows/ministatuswindow.h diff --git a/src/gui/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 8a7466f4b..6e546ef61 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/npcdialog.h" +#include "gui/windows/npcdialog.h" #include "actorspritemanager.h" #include "configuration.h" @@ -33,10 +33,11 @@ #include "being/being.h" #include "gui/gui.h" -#include "gui/inventorywindow.h" #include "gui/sdlfont.h" #include "gui/viewport.h" +#include "gui/windows/inventorywindow.h" + #include "gui/widgets/browserbox.h" #include "gui/widgets/button.h" #include "gui/widgets/inttextfield.h" diff --git a/src/gui/npcdialog.h b/src/gui/windows/npcdialog.h index d67407ac9..d67407ac9 100644 --- a/src/gui/npcdialog.h +++ b/src/gui/windows/npcdialog.h diff --git a/src/gui/npcpostdialog.cpp b/src/gui/windows/npcpostdialog.cpp index c76869980..af42495a9 100644 --- a/src/gui/npcpostdialog.cpp +++ b/src/gui/windows/npcpostdialog.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/npcpostdialog.h" +#include "gui/windows/npcpostdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/chattab.h" diff --git a/src/gui/npcpostdialog.h b/src/gui/windows/npcpostdialog.h index d9c31d6fd..d9c31d6fd 100644 --- a/src/gui/npcpostdialog.h +++ b/src/gui/windows/npcpostdialog.h diff --git a/src/gui/okdialog.cpp b/src/gui/windows/okdialog.cpp index 0bb08b3b1..49bf8aa0a 100644 --- a/src/gui/okdialog.cpp +++ b/src/gui/windows/okdialog.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/okdialog.h" +#include "gui/windows/okdialog.h" #include "soundconsts.h" #include "soundmanager.h" diff --git a/src/gui/okdialog.h b/src/gui/windows/okdialog.h index 851590595..851590595 100644 --- a/src/gui/okdialog.h +++ b/src/gui/windows/okdialog.h diff --git a/src/gui/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index 504c8bf49..38a837872 100644 --- a/src/gui/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/outfitwindow.h" +#include "gui/windows/outfitwindow.h" #include "configuration.h" #include "dragdrop.h" diff --git a/src/gui/outfitwindow.h b/src/gui/windows/outfitwindow.h index 5f7d32e02..5f7d32e02 100644 --- a/src/gui/outfitwindow.h +++ b/src/gui/windows/outfitwindow.h diff --git a/src/gui/questswindow.cpp b/src/gui/windows/questswindow.cpp index e77d2bbd7..8baa2454c 100644 --- a/src/gui/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/questswindow.h" +#include "gui/windows/questswindow.h" #include "actorspritemanager.h" #include "configuration.h" diff --git a/src/gui/questswindow.h b/src/gui/windows/questswindow.h index 72fdb7bb6..72fdb7bb6 100644 --- a/src/gui/questswindow.h +++ b/src/gui/windows/questswindow.h diff --git a/src/gui/quitdialog.cpp b/src/gui/windows/quitdialog.cpp index b601fe323..0eeece318 100644 --- a/src/gui/quitdialog.cpp +++ b/src/gui/windows/quitdialog.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/quitdialog.h" +#include "gui/windows/quitdialog.h" #include "client.h" #include "configuration.h" diff --git a/src/gui/quitdialog.h b/src/gui/windows/quitdialog.h index b0bde98fc..b0bde98fc 100644 --- a/src/gui/quitdialog.h +++ b/src/gui/windows/quitdialog.h diff --git a/src/gui/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index 183f6b6b8..841b3768f 100644 --- a/src/gui/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -20,14 +20,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/registerdialog.h" +#include "gui/windows/registerdialog.h" #include "client.h" #include "input/keydata.h" #include "input/keyevent.h" -#include "gui/okdialog.h" +#include "gui/windows/okdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/label.h" diff --git a/src/gui/registerdialog.h b/src/gui/windows/registerdialog.h index 0bc06b92d..0bc06b92d 100644 --- a/src/gui/registerdialog.h +++ b/src/gui/windows/registerdialog.h diff --git a/src/gui/selldialog.cpp b/src/gui/windows/selldialog.cpp index 4d30a742f..6c0edbe74 100644 --- a/src/gui/selldialog.cpp +++ b/src/gui/windows/selldialog.cpp @@ -20,15 +20,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/selldialog.h" +#include "gui/windows/selldialog.h" #include "shopitem.h" #include "units.h" #include "being/playerinfo.h" -#include "gui/confirmdialog.h" -#include "gui/tradewindow.h" +#include "gui/windows/confirmdialog.h" +#include "gui/windows/tradewindow.h" #include "gui/widgets/button.h" #include "gui/widgets/label.h" diff --git a/src/gui/selldialog.h b/src/gui/windows/selldialog.h index 532244845..532244845 100644 --- a/src/gui/selldialog.h +++ b/src/gui/windows/selldialog.h diff --git a/src/gui/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 2b3f7c697..96eb20562 100644 --- a/src/gui/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/serverdialog.h" +#include "gui/windows/serverdialog.h" #include "chatlogger.h" #include "client.h" @@ -30,11 +30,12 @@ #include "input/keydata.h" #include "input/keyevent.h" -#include "gui/editserverdialog.h" #include "gui/gui.h" -#include "gui/logindialog.h" #include "gui/sdlfont.h" +#include "gui/windows/editserverdialog.h" +#include "gui/windows/logindialog.h" + #include "gui/widgets/button.h" #include "gui/widgets/label.h" #include "gui/widgets/layout.h" diff --git a/src/gui/serverdialog.h b/src/gui/windows/serverdialog.h index ea6954e15..ea6954e15 100644 --- a/src/gui/serverdialog.h +++ b/src/gui/windows/serverdialog.h diff --git a/src/gui/setup.cpp b/src/gui/windows/setup.cpp index 77d2c2e5c..00001424b 100644 --- a/src/gui/setup.cpp +++ b/src/gui/windows/setup.cpp @@ -20,14 +20,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/setup.h" +#include "gui/windows/setup.h" -#include "chatwindow.h" #include "configuration.h" #include "game.h" #include "main.h" #include "touchmanager.h" +#include "gui/windows/chatwindow.h" + #include "gui/setup_audio.h" #include "gui/setup_chat.h" #include "gui/setup_colors.h" diff --git a/src/gui/setup.h b/src/gui/windows/setup.h index aeb7cc635..aeb7cc635 100644 --- a/src/gui/setup.h +++ b/src/gui/windows/setup.h diff --git a/src/gui/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index feafdb51d..a495d5750 100644 --- a/src/gui/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -20,12 +20,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/shopwindow.h" - -#include "gui/buydialog.h" -#include "gui/itemamountwindow.h" -#include "gui/selldialog.h" -#include "gui/tradewindow.h" +#include "gui/windows/buydialog.h" +#include "gui/windows/confirmdialog.h" +#include "gui/windows/itemamountwindow.h" +#include "gui/windows/shopwindow.h" +#include "gui/windows/selldialog.h" +#include "gui/windows/tradewindow.h" #include "gui/widgets/button.h" #include "gui/widgets/chattab.h" @@ -40,7 +40,6 @@ #include "auctionmanager.h" #include "client.h" #include "configuration.h" -#include "confirmdialog.h" #include "inventory.h" #include "item.h" #include "shopitem.h" diff --git a/src/gui/shopwindow.h b/src/gui/windows/shopwindow.h index 7e33416e9..6352f6721 100644 --- a/src/gui/shopwindow.h +++ b/src/gui/windows/shopwindow.h @@ -42,7 +42,8 @@ class ShopListBox; * * \ingroup Interface */ -class ShopWindow final : public Window, public gcn::ActionListener, +class ShopWindow final : public Window, + public gcn::ActionListener, public gcn::SelectionListener { public: diff --git a/src/gui/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp index 53aa18ece..1ae74efb3 100644 --- a/src/gui/shortcutwindow.cpp +++ b/src/gui/windows/shortcutwindow.cpp @@ -20,9 +20,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/shortcutwindow.h" +#include "gui/windows/shortcutwindow.h" -#include "gui/setup.h" +#include "gui/windows/setup.h" #include "gui/widgets/layout.h" #include "gui/widgets/scrollarea.h" diff --git a/src/gui/shortcutwindow.h b/src/gui/windows/shortcutwindow.h index cc2ba97b0..cc2ba97b0 100644 --- a/src/gui/shortcutwindow.h +++ b/src/gui/windows/shortcutwindow.h diff --git a/src/gui/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 94ac10fc6..39cdc5d2f 100644 --- a/src/gui/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/skilldialog.h" +#include "gui/windows/skilldialog.h" #include "configuration.h" #include "dragdrop.h" @@ -29,11 +29,12 @@ #include "being/localplayer.h" -#include "gui/setup.h" -#include "gui/shortcutwindow.h" #include "gui/textpopup.h" #include "gui/viewport.h" +#include "gui/windows/setup.h" +#include "gui/windows/shortcutwindow.h" + #include "gui/widgets/button.h" #include "gui/widgets/label.h" #include "gui/widgets/listbox.h" diff --git a/src/gui/skilldialog.h b/src/gui/windows/skilldialog.h index 9715a3bf3..9715a3bf3 100644 --- a/src/gui/skilldialog.h +++ b/src/gui/windows/skilldialog.h diff --git a/src/gui/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index f8a1650a4..687b1af69 100644 --- a/src/gui/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -19,7 +19,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/socialwindow.h" +#include "gui/windows/socialwindow.h" #include "actorspritemanager.h" #include "configuration.h" @@ -33,12 +33,13 @@ #include "input/keyboardconfig.h" -#include "gui/confirmdialog.h" -#include "gui/okdialog.h" -#include "gui/outfitwindow.h" -#include "gui/setup.h" -#include "gui/textdialog.h" -#include "gui/whoisonline.h" +#include "gui/windows/confirmdialog.h" +#include "gui/windows/okdialog.h" +#include "gui/windows/setup.h" +#include "gui/windows/textdialog.h" +#include "gui/windows/whoisonline.h" + +#include "gui/windows/outfitwindow.h" #include "gui/widgets/button.h" #include "gui/widgets/browserbox.h" diff --git a/src/gui/socialwindow.h b/src/gui/windows/socialwindow.h index 31d1b676a..31d1b676a 100644 --- a/src/gui/socialwindow.h +++ b/src/gui/windows/socialwindow.h diff --git a/src/gui/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index 767b4f537..bbc4558b0 100644 --- a/src/gui/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -20,22 +20,24 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/statuswindow.h" +#include "gui/windows/statuswindow.h" -#include "chatwindow.h" #include "configuration.h" #include "equipment.h" #include "inventory.h" #include "item.h" #include "units.h" +#include "gui/windows/chatwindow.h" + #include "being/localplayer.h" #include "being/playerinfo.h" -#include "gui/equipmentwindow.h" -#include "gui/setup.h" #include "gui/viewport.h" +#include "gui/windows/equipmentwindow.h" +#include "gui/windows/setup.h" + #include "gui/widgets/button.h" #include "gui/widgets/label.h" #include "gui/widgets/layouthelper.h" diff --git a/src/gui/statuswindow.h b/src/gui/windows/statuswindow.h index eebcd12ca..eebcd12ca 100644 --- a/src/gui/statuswindow.h +++ b/src/gui/windows/statuswindow.h diff --git a/src/gui/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index d960f20f7..1b4fb3440 100644 --- a/src/gui/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/textcommandeditor.h" +#include "gui/windows/textcommandeditor.h" #include "main.h" #include "spellmanager.h" diff --git a/src/gui/textcommandeditor.h b/src/gui/windows/textcommandeditor.h index 610b014d5..610b014d5 100644 --- a/src/gui/textcommandeditor.h +++ b/src/gui/windows/textcommandeditor.h diff --git a/src/gui/textdialog.cpp b/src/gui/windows/textdialog.cpp index 3b26ec2de..3f62cef08 100644 --- a/src/gui/textdialog.cpp +++ b/src/gui/windows/textdialog.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/textdialog.h" +#include "gui/windows/textdialog.h" #include "input/keyboardconfig.h" diff --git a/src/gui/textdialog.h b/src/gui/windows/textdialog.h index 9f9292ef6..9f9292ef6 100644 --- a/src/gui/textdialog.h +++ b/src/gui/windows/textdialog.h diff --git a/src/gui/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index e56b28913..bd3bf088f 100644 --- a/src/gui/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/tradewindow.h" +#include "gui/windows/tradewindow.h" #include "configuration.h" #include "inventory.h" @@ -32,10 +32,11 @@ #include "being/playerrelations.h" #include "gui/gui.h" -#include "gui/inventorywindow.h" -#include "gui/itemamountwindow.h" #include "gui/sdlfont.h" -#include "gui/setup.h" + +#include "gui/windows/inventorywindow.h" +#include "gui/windows/itemamountwindow.h" +#include "gui/windows/setup.h" #include "gui/widgets/button.h" #include "gui/widgets/chattab.h" diff --git a/src/gui/tradewindow.h b/src/gui/windows/tradewindow.h index df6d8a80a..df6d8a80a 100644 --- a/src/gui/tradewindow.h +++ b/src/gui/windows/tradewindow.h diff --git a/src/gui/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp index 3640456d0..9c445ebdd 100644 --- a/src/gui/unregisterdialog.cpp +++ b/src/gui/windows/unregisterdialog.cpp @@ -20,12 +20,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/unregisterdialog.h" +#include "gui/windows/unregisterdialog.h" #include "client.h" -#include "gui/okdialog.h" -#include "gui/registerdialog.h" +#include "gui/windows/okdialog.h" +#include "gui/windows/registerdialog.h" #include "gui/widgets/button.h" #include "gui/widgets/label.h" diff --git a/src/gui/unregisterdialog.h b/src/gui/windows/unregisterdialog.h index de0da27bb..de0da27bb 100644 --- a/src/gui/unregisterdialog.h +++ b/src/gui/windows/unregisterdialog.h diff --git a/src/gui/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 7eda825ad..d025f83b6 100644 --- a/src/gui/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/updaterwindow.h" +#include "gui/windows/updaterwindow.h" #include "client.h" #include "configuration.h" diff --git a/src/gui/updaterwindow.h b/src/gui/windows/updaterwindow.h index e317e3f95..e317e3f95 100644 --- a/src/gui/updaterwindow.h +++ b/src/gui/windows/updaterwindow.h diff --git a/src/gui/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index 4fd630a46..dafbb0419 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -20,15 +20,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/whoisonline.h" +#include "gui/windows/whoisonline.h" #include "guild.h" #include "party.h" -#include "gui/chatwindow.h" -#include "gui/socialwindow.h" #include "gui/viewport.h" +#include "gui/windows/chatwindow.h" +#include "gui/windows/socialwindow.h" + #include "gui/widgets/button.h" #include "gui/widgets/browserbox.h" #include "gui/widgets/scrollarea.h" diff --git a/src/gui/whoisonline.h b/src/gui/windows/whoisonline.h index 860eeacda..860eeacda 100644 --- a/src/gui/whoisonline.h +++ b/src/gui/windows/whoisonline.h diff --git a/src/gui/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp index d65c02e4f..bd46df9a1 100644 --- a/src/gui/worldselectdialog.cpp +++ b/src/gui/windows/worldselectdialog.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/worldselectdialog.h" +#include "gui/windows/worldselectdialog.h" #include "client.h" diff --git a/src/gui/worldselectdialog.h b/src/gui/windows/worldselectdialog.h index ace7fd63c..ace7fd63c 100644 --- a/src/gui/worldselectdialog.h +++ b/src/gui/windows/worldselectdialog.h diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp index bd6fe9f59..b4fff604e 100644 --- a/src/guildmanager.cpp +++ b/src/guildmanager.cpp @@ -29,7 +29,7 @@ #include "being/localplayer.h" -#include "gui/socialwindow.h" +#include "gui/windows/socialwindow.h" #include "gui/widgets/guildchattab.h" diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp index d5e3b3957..04b4744b6 100644 --- a/src/input/inputmanager.cpp +++ b/src/input/inputmanager.cpp @@ -31,16 +31,18 @@ #include "input/keyboardconfig.h" #include "input/keyboarddata.h" -#include "gui/chatwindow.h" #include "gui/gui.h" -#include "gui/inventorywindow.h" -#include "gui/npcdialog.h" -#include "gui/npcpostdialog.h" #include "gui/sdlinput.h" -#include "gui/setup.h" #include "gui/setup_input.h" -#include "gui/textdialog.h" -#include "gui/tradewindow.h" + +#include "gui/windows/inventorywindow.h" +#include "gui/windows/npcdialog.h" +#include "gui/windows/npcpostdialog.h" +#include "gui/windows/setup.h" +#include "gui/windows/textdialog.h" +#include "gui/windows/tradewindow.h" + +#include "gui/windows/chatwindow.h" #include <guichan/exception.hpp> #include <guichan/focushandler.hpp> diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp index 9332211ce..5ef762de8 100644 --- a/src/itemshortcut.cpp +++ b/src/itemshortcut.cpp @@ -30,7 +30,7 @@ #include "being/playerinfo.h" -#include "gui/skilldialog.h" +#include "gui/windows/skilldialog.h" #include "net/inventoryhandler.h" #include "net/net.h" diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp index 0e8add107..56ec0bf79 100644 --- a/src/net/charserverhandler.cpp +++ b/src/net/charserverhandler.cpp @@ -21,7 +21,7 @@ #include "net/charserverhandler.h" -#include "gui/charselectdialog.h" +#include "gui/windows/charselectdialog.h" #include "debug.h" diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index 7702a5a9b..956f4d20b 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -39,11 +39,13 @@ #include "input/keyboardconfig.h" -#include "gui/botcheckerwindow.h" -#include "gui/outfitwindow.h" -#include "gui/socialwindow.h" -#include "gui/killstats.h" -#include "gui/questswindow.h" +#include "gui/windows/socialwindow.h" +#include "gui/windows/killstats.h" +#include "gui/windows/questswindow.h" + +#include "gui/windows/botcheckerwindow.h" + +#include "gui/windows/outfitwindow.h" #include "resources/itemdb.h" #include "resources/iteminfo.h" diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp index 601c3fbdf..15a4385dc 100644 --- a/src/net/ea/buysellhandler.cpp +++ b/src/net/ea/buysellhandler.cpp @@ -30,11 +30,12 @@ #include "being/playerinfo.h" -#include "gui/buydialog.h" -#include "gui/chatwindow.h" -#include "gui/buyselldialog.h" -#include "gui/selldialog.h" -#include "gui/shopwindow.h" +#include "gui/windows/chatwindow.h" +#include "gui/windows/buyselldialog.h" +#include "gui/windows/selldialog.h" + +#include "gui/windows/buydialog.h" +#include "gui/windows/shopwindow.h" #include "net/chathandler.h" #include "net/net.h" diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index 7ff7e6eb8..4caa6ac3b 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -25,8 +25,8 @@ #include "client.h" #include "configuration.h" -#include "gui/charcreatedialog.h" -#include "gui/okdialog.h" +#include "gui/windows/charcreatedialog.h" +#include "gui/windows/okdialog.h" #include "net/ea/loginhandler.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index 403848a88..873e93aee 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -31,8 +31,8 @@ #include "being/localplayer.h" #include "being/playerrelations.h" -#include "gui/chatwindow.h" -#include "gui/shopwindow.h" +#include "gui/windows/chatwindow.h" +#include "gui/windows/shopwindow.h" #include "gui/widgets/chattab.h" #include "gui/widgets/gmtab.h" diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp index 0f0192dfa..54371d247 100644 --- a/src/net/ea/gamehandler.cpp +++ b/src/net/ea/gamehandler.cpp @@ -29,7 +29,7 @@ #include "being/localplayer.h" -#include "gui/okdialog.h" +#include "gui/windows/okdialog.h" #include "debug.h" diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp index 47205f2f4..7e46438d2 100644 --- a/src/net/ea/guildhandler.cpp +++ b/src/net/ea/guildhandler.cpp @@ -28,7 +28,7 @@ #include "being/localplayer.h" -#include "gui/socialwindow.h" +#include "gui/windows/socialwindow.h" #include "debug.h" diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 69e1d7587..68bbe85b0 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -27,7 +27,7 @@ #include "being/localplayer.h" -#include "gui/ministatuswindow.h" +#include "gui/windows/ministatuswindow.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index 776443cf7..9f55a3603 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -30,7 +30,7 @@ #include "being/playerinfo.h" -#include "gui/inventorywindow.h" +#include "gui/windows/inventorywindow.h" #include "net/inventoryhandler.h" #include "net/messagein.h" diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index 59d72dd78..d67f1d37a 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -26,7 +26,7 @@ #include "configuration.h" #include "logger.h" -#include "gui/logindialog.h" +#include "gui/windows/logindialog.h" #include "utils/dtor.h" #include "utils/gettext.h" diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp index 654a783b3..b3af53e87 100644 --- a/src/net/ea/npchandler.cpp +++ b/src/net/ea/npchandler.cpp @@ -22,7 +22,7 @@ #include "net/ea/npchandler.h" -#include "gui/npcdialog.h" +#include "gui/windows/npcdialog.h" #include "debug.h" diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp index b7353be26..6b2462450 100644 --- a/src/net/ea/partyhandler.cpp +++ b/src/net/ea/partyhandler.cpp @@ -28,7 +28,7 @@ #include "being/localplayer.h" -#include "gui/socialwindow.h" +#include "gui/windows/socialwindow.h" #include "debug.h" diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 320727e01..03e62f45e 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -31,13 +31,14 @@ #include "being/localplayer.h" -#include "gui/ministatuswindow.h" -#include "gui/okdialog.h" -#include "gui/npcdialog.h" -#include "gui/skilldialog.h" -#include "gui/statuswindow.h" #include "gui/viewport.h" +#include "gui/windows/ministatuswindow.h" +#include "gui/windows/okdialog.h" +#include "gui/windows/npcdialog.h" +#include "gui/windows/skilldialog.h" +#include "gui/windows/statuswindow.h" + #include "resources/deaddb.h" #include "net/net.h" diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp index 47dc2c2d4..34848077a 100644 --- a/src/net/ea/skillhandler.cpp +++ b/src/net/ea/skillhandler.cpp @@ -29,7 +29,7 @@ #include "being/localplayer.h" #include "being/playerinfo.h" -#include "gui/skilldialog.h" +#include "gui/windows/skilldialog.h" #include "utils/stringutils.h" diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index 3e1e5c5b3..abfb56559 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -31,8 +31,8 @@ #include "being/playerinfo.h" #include "being/playerrelations.h" -#include "gui/confirmdialog.h" -#include "gui/tradewindow.h" +#include "gui/windows/confirmdialog.h" +#include "gui/windows/tradewindow.h" #include "net/inventoryhandler.h" #include "net/net.h" diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 1833c9a87..f136abfeb 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -32,9 +32,10 @@ #include "input/keyboardconfig.h" -#include "gui/outfitwindow.h" -#include "gui/socialwindow.h" -#include "gui/killstats.h" +#include "gui/windows/socialwindow.h" +#include "gui/windows/killstats.h" + +#include "gui/windows/outfitwindow.h" #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp index 44c8eb125..361fe89a0 100644 --- a/src/net/eathena/buysellhandler.cpp +++ b/src/net/eathena/buysellhandler.cpp @@ -27,7 +27,7 @@ #include "being/playerinfo.h" -#include "gui/buydialog.h" +#include "gui/windows/buydialog.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 4f1edd971..f6657db36 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -26,10 +26,10 @@ #include "configuration.h" #include "logger.h" -#include "gui/inventorywindow.h" -#include "gui/skilldialog.h" -#include "gui/socialwindow.h" -#include "gui/statuswindow.h" +#include "gui/windows/inventorywindow.h" +#include "gui/windows/skilldialog.h" +#include "gui/windows/socialwindow.h" +#include "gui/windows/statuswindow.h" #include "net/ea/guildhandler.h" diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp index b0066b561..8ca545adf 100644 --- a/src/net/eathena/npchandler.cpp +++ b/src/net/eathena/npchandler.cpp @@ -24,7 +24,7 @@ #include "being/localplayer.h" -#include "gui/npcdialog.h" +#include "gui/windows/npcdialog.h" #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp index 08719e0b6..4fc80acb1 100644 --- a/src/net/tmwa/buysellhandler.cpp +++ b/src/net/tmwa/buysellhandler.cpp @@ -27,7 +27,7 @@ #include "being/playerinfo.h" -#include "gui/buydialog.h" +#include "gui/windows/buydialog.h" #include "net/ea/eaprotocol.h" diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index cb01e6509..d2fe22c62 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -26,10 +26,10 @@ #include "configuration.h" #include "logger.h" -#include "gui/inventorywindow.h" -#include "gui/skilldialog.h" -#include "gui/socialwindow.h" -#include "gui/statuswindow.h" +#include "gui/windows/inventorywindow.h" +#include "gui/windows/skilldialog.h" +#include "gui/windows/socialwindow.h" +#include "gui/windows/statuswindow.h" #include "net/ea/guildhandler.h" diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index 026727a6e..d03cd4fb5 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -24,9 +24,10 @@ #include "being/localplayer.h" -#include "gui/npcdialog.h" #include "gui/viewport.h" +#include "gui/windows/npcdialog.h" + #include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index dc6244f43..0361e125d 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -31,7 +31,7 @@ #include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" -#include "gui/whoisonline.h" +#include "gui/windows/whoisonline.h" #include "debug.h" diff --git a/src/net/tmwa/questhandler.cpp b/src/net/tmwa/questhandler.cpp index 4df7f06ce..ca9a2c9f1 100644 --- a/src/net/tmwa/questhandler.cpp +++ b/src/net/tmwa/questhandler.cpp @@ -20,8 +20,8 @@ #include "net/tmwa/questhandler.h" -#include "gui/skilldialog.h" -#include "gui/questswindow.h" +#include "gui/windows/skilldialog.h" +#include "gui/windows/questswindow.h" #include "net/tmwa/protocol.h" diff --git a/src/spellmanager.cpp b/src/spellmanager.cpp index 91cfb1ff2..c8f6fd836 100644 --- a/src/spellmanager.cpp +++ b/src/spellmanager.cpp @@ -27,7 +27,7 @@ #include "being/localplayer.h" #include "being/playerinfo.h" -#include "gui/chatwindow.h" +#include "gui/windows/chatwindow.h" #include "net/net.h" #include "net/playerhandler.h" |