Move notifytypes.h into enums directory.

34 files changed, 71 insertions, 67 deletions

diff --git a/src/resources/notifytypes.h b/src/enums/resources/notifytypes.h
index 26cf8c153..c542de3d7 100644
--- a/src/resources/notifytypes.h
+++ b/src/enums/resources/notifytypes.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RESOURCES_NOTIFYTYPES_H
-#define RESOURCES_NOTIFYTYPES_H
+#ifndef ENUMS_RESOURCES_NOTIFYTYPES_H
+#define ENUMS_RESOURCES_NOTIFYTYPES_H
 
 #include "localconsts.h"
 
@@ -177,4 +177,4 @@ namespace NotifyTypes
         TYPE_END
     };
 }  // namespace NotifyTypes
-#endif  // RESOURCES_NOTIFYTYPES_H
+#endif  // ENUMS_RESOURCES_NOTIFYTYPES_H
diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index 6158d5d42..bf4bd590c 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -24,6 +24,8 @@
 
 #include "notifymanager.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "gui/chatconsts.h"
 
 #include "net/chathandler.h"
@@ -32,8 +34,6 @@
 
 #include "utils/stringutils.h"
 
-#include "resources/notifytypes.h"
-
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index fab83e9a0..a69d04738 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -27,6 +27,8 @@
 
 #include "being/playerinfo.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "gui/windows/buydialog.h"
 #include "gui/windows/buyselldialog.h"
 #include "gui/windows/npcselldialog.h"
@@ -35,8 +37,6 @@
 
 #include "net/ea/eaprotocol.h"
 
-#include "resources/notifytypes.h"
-
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 554276d17..0ece76168 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -28,14 +28,14 @@
 
 #include "being/being.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "gui/windows/chatwindow.h"
 
 #include "gui/widgets/tabs/chat/gmtab.h"
 
 #include "net/messagein.h"
 
-#include "resources/notifytypes.h"
-
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index a268bc5dc..8f21edf8f 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -26,14 +26,14 @@
 #include "game.h"
 #include "notifymanager.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "gui/windows/okdialog.h"
 
 #include "gui/widgets/createwidget.h"
 
 #include "net/messagein.h"
 
-#include "resources/notifytypes.h"
-
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index 96956b2d9..d68953e37 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -27,6 +27,8 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "gui/windows/skilldialog.h"
 #include "gui/windows/socialwindow.h"
 
@@ -38,8 +40,6 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include "resources/notifytypes.h"
-
 #include "debug.h"
 
 GuildTab *guildTab = nullptr;
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 2a9d56ae2..b3821822e 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -28,6 +28,8 @@
 
 #include "enums/equipslot.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "gui/widgets/createwidget.h"
 
 #include "net/messagein.h"
@@ -39,8 +41,6 @@
 
 #include "listeners/arrowslistener.h"
 
-#include "resources/notifytypes.h"
-
 #include "debug.h"
 
 const EquipSlot::Type EQUIP_POINTS[EquipSlot::VECTOREND] =
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index cb3498412..83d5f04b4 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -28,6 +28,8 @@
 
 #include "being/localplayer.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "gui/windows/chatwindow.h"
 #include "gui/windows/socialwindow.h"
 
@@ -37,8 +39,6 @@
 
 #include "utils/delete2.h"
 
-#include "resources/notifytypes.h"
-
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 8b4ed3b34..177b3a023 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -31,13 +31,13 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "gui/viewport.h"
 
 #include "gui/windows/skilldialog.h"
 #include "gui/windows/statuswindow.h"
 
-#include "resources/notifytypes.h"
-
 #include "resources/map/map.h"
 
 #include "net/ea/eaprotocol.h"
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index c27dba4f4..e7bd9e86f 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -27,6 +27,8 @@
 #include "being/playerinfo.h"
 #include "being/playerrelation.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "gui/windows/tradewindow.h"
 
 #include "gui/widgets/createwidget.h"
@@ -36,8 +38,6 @@
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
-#include "resources/notifytypes.h"
-
 #include "listeners/requesttradelistener.h"
 
 #include "debug.h"
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;
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index 165f87b37..e09fd2ae8 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -27,6 +27,8 @@
 
 #include "being/playerinfo.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "gui/windows/buydialog.h"
 #include "gui/windows/chatwindow.h"
 #include "gui/windows/shopwindow.h"
@@ -37,8 +39,6 @@
 
 #include "net/tmwa/protocol.h"
 
-#include "resources/notifytypes.h"
-
 #include "utils/timer.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/guildmanager.cpp b/src/net/tmwa/guildmanager.cpp
index a83672f87..928567fe0 100644
--- a/src/net/tmwa/guildmanager.cpp
+++ b/src/net/tmwa/guildmanager.cpp
@@ -28,6 +28,8 @@
 
 #include "being/localplayer.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "gui/windows/chatwindow.h"
 #include "gui/windows/socialwindow.h"
 
@@ -40,8 +42,6 @@
 #include "utils/delete2.h"
 #include "utils/timer.h"
 
-#include "resources/notifytypes.h"
-
 #include "debug.h"
 
 GuildManager *guildManager = nullptr;
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index cff6241f9..7c40df902 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -31,6 +31,8 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "listeners/arrowslistener.h"
 
 #include "net/tmwa/messageout.h"
@@ -39,8 +41,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/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 390671345..92e26ec81 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/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/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
-#include "resources/notifytypes.h"
-
 #include "debug.h"
 
 extern Net::PartyHandler *partyHandler;
diff --git a/src/net/tmwa/skillhandler.cpp b/src/net/tmwa/skillhandler.cpp
index 5e8dd9729..292e93d2d 100644
--- a/src/net/tmwa/skillhandler.cpp
+++ b/src/net/tmwa/skillhandler.cpp
@@ -27,13 +27,13 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "gui/windows/skilldialog.h"
 
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
-#include "resources/notifytypes.h"
-
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index c169b5763..76a8903d6 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -30,6 +30,8 @@
 #include "being/playerrelation.h"
 #include "being/playerrelations.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "gui/windows/tradewindow.h"
 
 #include "net/tmwa/messageout.h"
@@ -37,8 +39,6 @@
 
 #include "net/ea/eaprotocol.h"
 
-#include "resources/notifytypes.h"
-
 #include "utils/stringutils.h"
 
 #include "debug.h"
diff --git a/src/notifymanager.cpp b/src/notifymanager.cpp
index 97f9ea18a..719912f12 100644
--- a/src/notifymanager.cpp
+++ b/src/notifymanager.cpp
@@ -24,6 +24,8 @@
 
 #include "being/localplayer.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "net/guildhandler.h"
 #include "net/partyhandler.h"
 
@@ -32,7 +34,6 @@
 #endif
 
 #include "resources/notifications.h"
-#include "resources/notifytypes.h"
 
 #include "resources/db/sounddb.h"
 
diff --git a/src/resources/db/sounddb.cpp b/src/resources/db/sounddb.cpp
index 09b7af65d..bdab15f2f 100644
--- a/src/resources/db/sounddb.cpp
+++ b/src/resources/db/sounddb.cpp
@@ -23,8 +23,9 @@
 #include "configuration.h"
 #include "notifymanager.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "resources/beingcommon.h"
-#include "resources/notifytypes.h"
 
 #include "debug.h"
 
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index 19a6b3e08..8441252e2 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -37,13 +37,14 @@
 
 #include "being/localplayer.h"
 
+#include "enums/resources/notifytypes.h"
+
 #include "gui/userpalette.h"
 
 #include "particle/particle.h"
 
 #include "resources/ambientlayer.h"
 #include "resources/mapitemtype.h"
-#include "resources/notifytypes.h"
 #include "resources/resourcemanager.h"
 #include "resources/subimage.h"