From 23a3e48c33b14cc0bda0eb3fda361961e8d6172c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 29 Jun 2015 15:24:14 +0300 Subject: Move notifytypes.h into enums directory. --- src/net/eathena/bankhandler.cpp | 4 ++-- src/net/eathena/beinghandler.cpp | 4 ++-- src/net/eathena/buyingstorehandler.cpp | 4 ++-- src/net/eathena/buysellhandler.cpp | 4 ++-- src/net/eathena/chathandler.cpp | 4 ++-- src/net/eathena/homunculushandler.cpp | 3 ++- src/net/eathena/inventoryhandler.cpp | 8 ++++---- src/net/eathena/mailhandler.cpp | 4 ++-- src/net/eathena/markethandler.cpp | 4 ++-- src/net/eathena/mercenaryhandler.cpp | 4 ++-- src/net/eathena/partyhandler.cpp | 4 ++-- src/net/eathena/pethandler.cpp | 4 ++-- src/net/eathena/searchstorehandler.cpp | 4 ++-- src/net/eathena/skillhandler.cpp | 4 ++-- src/net/eathena/tradehandler.cpp | 4 ++-- 15 files changed, 32 insertions(+), 31 deletions(-) (limited to 'src/net/eathena') diff --git a/src/net/eathena/bankhandler.cpp b/src/net/eathena/bankhandler.cpp index 50b1513ab..e4dff0710 100644 --- a/src/net/eathena/bankhandler.cpp +++ b/src/net/eathena/bankhandler.cpp @@ -22,13 +22,13 @@ #include "notifymanager.h" +#include "enums/resources/notifytypes.h" + #include "listeners/banklistener.h" #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "resources/notifytypes.h" - #include "debug.h" extern Net::BankHandler *bankHandler; diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 26e78cd84..79fddcf18 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -32,6 +32,8 @@ #include "being/mercenaryinfo.h" #include "being/playerinfo.h" +#include "enums/resources/notifytypes.h" + #include "particle/particle.h" #include "input/keyboardconfig.h" @@ -50,8 +52,6 @@ #include "net/eathena/sprite.h" #include "resources/iteminfo.h" -#include "resources/notifytypes.h" - #include "resources/db/itemdb.h" #include "resources/map/map.h" diff --git a/src/net/eathena/buyingstorehandler.cpp b/src/net/eathena/buyingstorehandler.cpp index f317cd712..f2017bd53 100644 --- a/src/net/eathena/buyingstorehandler.cpp +++ b/src/net/eathena/buyingstorehandler.cpp @@ -28,6 +28,8 @@ #include "being/localplayer.h" #include "being/playerinfo.h" +#include "enums/resources/notifytypes.h" + #include "gui/windows/buyingstoreselldialog.h" #include "gui/widgets/createwidget.h" @@ -41,8 +43,6 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "resources/notifytypes.h" - #include "debug.h" extern Net::BuyingStoreHandler *buyingStoreHandler; diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp index 00895f7d9..da64491ed 100644 --- a/src/net/eathena/buysellhandler.cpp +++ b/src/net/eathena/buysellhandler.cpp @@ -26,6 +26,8 @@ #include "being/playerinfo.h" +#include "enums/resources/notifytypes.h" + #include "gui/windows/buydialog.h" #include "gui/widgets/createwidget.h" @@ -33,8 +35,6 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "resources/notifytypes.h" - #include "debug.h" extern Net::BuySellHandler *buySellHandler; diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp index 712e66f86..5d5e889d9 100644 --- a/src/net/eathena/chathandler.cpp +++ b/src/net/eathena/chathandler.cpp @@ -30,6 +30,8 @@ #include "being/playerrelation.h" #include "being/playerrelations.h" +#include "enums/resources/notifytypes.h" + #include "gui/chatconsts.h" #include "gui/windows/chatwindow.h" @@ -43,8 +45,6 @@ #include "net/eathena/protocol.h" #include "resources/chatobject.h" -#include "resources/notifytypes.h" - #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/net/eathena/homunculushandler.cpp b/src/net/eathena/homunculushandler.cpp index 537ea33d8..e98d73fe0 100644 --- a/src/net/eathena/homunculushandler.cpp +++ b/src/net/eathena/homunculushandler.cpp @@ -26,6 +26,8 @@ #include "being/homunculusinfo.h" #include "being/playerinfo.h" +#include "enums/resources/notifytypes.h" + #include "gui/windows/skilldialog.h" #include "net/serverfeatures.h" @@ -34,7 +36,6 @@ #include "net/eathena/protocol.h" #include "resources/iteminfo.h" -#include "resources/notifytypes.h" #include "resources/db/itemdb.h" diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index 0e90235f6..9edbc4d67 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -25,11 +25,13 @@ #include "item.h" #include "notifymanager.h" -#include "enums/equipslot.h" - #include "being/localplayer.h" #include "being/playerinfo.h" +#include "enums/equipslot.h" + +#include "enums/resources/notifytypes.h" + #include "listeners/arrowslistener.h" #include "net/eathena/itemflags.h" @@ -40,8 +42,6 @@ #include "net/ea/eaprotocol.h" #include "net/ea/equipbackend.h" -#include "resources/notifytypes.h" - #include "debug.h" extern Net::InventoryHandler *inventoryHandler; diff --git a/src/net/eathena/mailhandler.cpp b/src/net/eathena/mailhandler.cpp index 0f74e0af2..e9d052b78 100644 --- a/src/net/eathena/mailhandler.cpp +++ b/src/net/eathena/mailhandler.cpp @@ -22,6 +22,8 @@ #include "notifymanager.h" +#include "enums/resources/notifytypes.h" + #include "gui/mailmessage.h" #include "gui/windows/mailwindow.h" @@ -31,8 +33,6 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "resources/notifytypes.h" - #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/net/eathena/markethandler.cpp b/src/net/eathena/markethandler.cpp index 3157878ea..265fc7ca5 100644 --- a/src/net/eathena/markethandler.cpp +++ b/src/net/eathena/markethandler.cpp @@ -24,6 +24,8 @@ #include "being/playerinfo.h" +#include "enums/resources/notifytypes.h" + #include "gui/windows/buydialog.h" #include "gui/widgets/createwidget.h" @@ -31,8 +33,6 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "resources/notifytypes.h" - #include "debug.h" extern Net::MarketHandler *marketHandler; diff --git a/src/net/eathena/mercenaryhandler.cpp b/src/net/eathena/mercenaryhandler.cpp index bbe8cc8bf..3d5f0a72c 100644 --- a/src/net/eathena/mercenaryhandler.cpp +++ b/src/net/eathena/mercenaryhandler.cpp @@ -27,6 +27,8 @@ #include "being/mercenaryinfo.h" #include "being/playerinfo.h" +#include "enums/resources/notifytypes.h" + #include "gui/windows/skilldialog.h" #include "net/serverfeatures.h" @@ -34,8 +36,6 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "resources/notifytypes.h" - #include "debug.h" extern Net::MercenaryHandler *mercenaryHandler; diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp index c612f13f0..bbc2d0b48 100644 --- a/src/net/eathena/partyhandler.cpp +++ b/src/net/eathena/partyhandler.cpp @@ -27,6 +27,8 @@ #include "being/localplayer.h" +#include "enums/resources/notifytypes.h" + #include "gui/windows/chatwindow.h" #include "gui/windows/socialwindow.h" @@ -35,8 +37,6 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "resources/notifytypes.h" - #include "debug.h" extern Net::PartyHandler *partyHandler; diff --git a/src/net/eathena/pethandler.cpp b/src/net/eathena/pethandler.cpp index 0b31295f8..d813b6551 100644 --- a/src/net/eathena/pethandler.cpp +++ b/src/net/eathena/pethandler.cpp @@ -27,6 +27,8 @@ #include "being/petinfo.h" #include "being/playerinfo.h" +#include "enums/resources/notifytypes.h" + #include "gui/windows/eggselectiondialog.h" #include "gui/widgets/createwidget.h" @@ -42,8 +44,6 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "resources/notifytypes.h" - #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/net/eathena/searchstorehandler.cpp b/src/net/eathena/searchstorehandler.cpp index 51aaccd98..c133ed184 100644 --- a/src/net/eathena/searchstorehandler.cpp +++ b/src/net/eathena/searchstorehandler.cpp @@ -23,11 +23,11 @@ #include "logger.h" #include "notifymanager.h" +#include "enums/resources/notifytypes.h" + #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "resources/notifytypes.h" - #include "debug.h" extern Net::SearchStoreHandler *searchStoreHandler; diff --git a/src/net/eathena/skillhandler.cpp b/src/net/eathena/skillhandler.cpp index fb8cf39e7..8c941e88f 100644 --- a/src/net/eathena/skillhandler.cpp +++ b/src/net/eathena/skillhandler.cpp @@ -27,6 +27,8 @@ #include "being/localplayer.h" #include "being/playerinfo.h" +#include "enums/resources/notifytypes.h" + #include "gui/widgets/skillinfo.h" #include "gui/windows/skilldialog.h" @@ -35,8 +37,6 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" -#include "resources/notifytypes.h" - #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp index 4f036d09b..749d9343e 100644 --- a/src/net/eathena/tradehandler.cpp +++ b/src/net/eathena/tradehandler.cpp @@ -28,6 +28,8 @@ #include "being/playerinfo.h" +#include "enums/resources/notifytypes.h" + #include "gui/windows/tradewindow.h" #include "net/eathena/messageout.h" @@ -35,8 +37,6 @@ #include "net/ea/eaprotocol.h" -#include "resources/notifytypes.h" - #include "debug.h" extern Net::TradeHandler *tradeHandler; -- cgit v1.2.3-70-g09d2