Add event.h to eventmanager.h and listener.h to reduce total number of includes

You'll have to include it anyways 99% of the time

24 files changed, 4 insertions, 25 deletions

diff --git a/src/client.cpp b/src/client.cpp
index f78562b4..fac3c5b7 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -25,7 +25,6 @@
 #include "chatlog.h"
 #include "configuration.h"
 #include "emoteshortcut.h"
-#include "event.h"
 #include "eventmanager.h"
 #include "game.h"
 #include "itemshortcut.h"
diff --git a/src/eventmanager.h b/src/eventmanager.h
index 53a3be60..ac6c997c 100644
--- a/src/eventmanager.h
+++ b/src/eventmanager.h
@@ -21,6 +21,8 @@
 #ifndef EVENTMANAGER_H
 #define EVENTMANAGER_H
 
+#include "event.h"
+
 #include <string>
 #include <map>
 #include <set>
@@ -33,7 +35,6 @@ Mana::EventManager::trigger("Notices", event); }
 namespace Mana
 {
 
-class Event;
 class Listener;
 
 typedef std::set<Listener *> ListenerSet;
diff --git a/src/game.cpp b/src/game.cpp
index 955de326..cf0769de 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -28,7 +28,6 @@
 #include "commandhandler.h"
 #include "configuration.h"
 #include "effectmanager.h"
-#include "event.h"
 #include "eventmanager.h"
 #include "emoteshortcut.h"
 #include "graphics.h"
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 31f6e279..6ad45fc8 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -23,7 +23,6 @@
 
 #include "actorspritemanager.h"
 #include "configuration.h"
-#include "event.h"
 #include "localplayer.h"
 #include "party.h"
 
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 89ef8682..fb7d1c8c 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -21,7 +21,6 @@
 
 #include "gui/inventorywindow.h"
 
-#include "event.h"
 #include "inventory.h"
 #include "item.h"
 #include "units.h"
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index 84c88ec7..eb7c0756 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -23,7 +23,6 @@
 
 #include "animatedsprite.h"
 #include "configuration.h"
-#include "event.h"
 #include "graphics.h"
 #include "playerinfo.h"
 
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 6114cc41..ec35bb9e 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -21,7 +21,6 @@
 
 #include "gui/statuswindow.h"
 
-#include "event.h"
 #include "localplayer.h"
 #include "playerinfo.h"
 #include "units.h"
diff --git a/src/listener.h b/src/listener.h
index 2a5654b7..25b388a0 100644
--- a/src/listener.h
+++ b/src/listener.h
@@ -21,13 +21,13 @@
 #ifndef LISTENER_H
 #define LISTENER_H
 
+#include "event.h"
+
 #include <string>
 
 namespace Mana
 {
 
-class Event;
-
 class Listener
 {
 public:
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 0aa76f51..bcebbfd4 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -24,7 +24,6 @@
 #include "client.h"
 #include "configuration.h"
 #include "effectmanager.h"
-#include "event.h"
 #include "flooritem.h"
 #include "graphics.h"
 #include "guild.h"
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index 6fbbb954..210e3043 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -22,7 +22,6 @@
 #include "net/manaserv/generalhandler.h"
 
 #include "client.h"
-#include "event.h"
 
 #include "gui/changeemaildialog.h"
 #include "gui/charselectdialog.h"
diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp
index b5d7e7bd..1c9625bf 100644
--- a/src/net/manaserv/guildhandler.cpp
+++ b/src/net/manaserv/guildhandler.cpp
@@ -21,7 +21,6 @@
 
 #include "net/manaserv/guildhandler.h"
 
-#include "event.h"
 #include "eventmanager.h"
 #include "guild.h"
 #include "log.h"
diff --git a/src/net/manaserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp
index a9145269..00bb0fae 100644
--- a/src/net/manaserv/partyhandler.cpp
+++ b/src/net/manaserv/partyhandler.cpp
@@ -21,7 +21,6 @@
 
 #include "net/manaserv/partyhandler.h"
 
-#include "event.h"
 #include "eventmanager.h"
 #include "log.h"
 #include "localplayer.h"
diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp
index 5f9fa83e..a80fc6e6 100644
--- a/src/net/manaserv/tradehandler.cpp
+++ b/src/net/manaserv/tradehandler.cpp
@@ -22,7 +22,6 @@
 #include "net/manaserv/tradehandler.h"
 
 #include "actorspritemanager.h"
-#include "event.h"
 #include "eventmanager.h"
 #include "item.h"
 #include "localplayer.h"
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index 330708db..feaf7efd 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -23,7 +23,6 @@
 
 #include "actorspritemanager.h"
 #include "being.h"
-#include "event.h"
 #include "eventmanager.h"
 #include "game.h"
 #include "playerrelations.h"
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index 03480e45..a43784de 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -22,7 +22,6 @@
 #include "net/tmwa/buysellhandler.h"
 
 #include "actorspritemanager.h"
-#include "event.h"
 #include "eventmanager.h"
 #include "inventory.h"
 #include "item.h"
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 13879152..2b65b515 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -23,7 +23,6 @@
 
 #include "actorspritemanager.h"
 #include "being.h"
-#include "event.h"
 #include "eventmanager.h"
 #include "game.h"
 #include "localplayer.h"
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index 183c2c8a..03d27b47 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -22,7 +22,6 @@
 #include "net/tmwa/gamehandler.h"
 
 #include "client.h"
-#include "event.h"
 #include "eventmanager.h"
 #include "game.h"
 #include "localplayer.h"
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index ba9b329e..1cc6cb47 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -23,7 +23,6 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "event.h"
 #include "log.h"
 
 #include "gui/charselectdialog.h"
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 21cf9c32..a09f2dfe 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -21,7 +21,6 @@
 #include "net/tmwa/guildhandler.h"
 
 #include "guild.h"
-#include "event.h"
 #include "eventmanager.h"
 #include "localplayer.h"
 #include "log.h"
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 7b019085..ae9731ba 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -23,7 +23,6 @@
 
 #include "configuration.h"
 #include "equipment.h"
-#include "event.h"
 #include "eventmanager.h"
 #include "inventory.h"
 #include "item.h"
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 7f8dca0f..6983b731 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -21,7 +21,6 @@
 #include "net/tmwa/partyhandler.h"
 
 #include "actorspritemanager.h"
-#include "event.h"
 #include "eventmanager.h"
 #include "localplayer.h"
 #include "log.h"
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 0388573f..733d4a88 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -21,7 +21,6 @@
 
 #include "net/tmwa/playerhandler.h"
 
-#include "event.h"
 #include "eventmanager.h"
 #include "game.h"
 #include "localplayer.h"
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index 0610f5be..e9712d5e 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -21,7 +21,6 @@
 
 #include "net/tmwa/tradehandler.h"
 
-#include "event.h"
 #include "eventmanager.h"
 #include "inventory.h"
 #include "item.h"
diff --git a/src/playerinfo.cpp b/src/playerinfo.cpp
index 24cbe0ce..28d37c83 100644
--- a/src/playerinfo.cpp
+++ b/src/playerinfo.cpp
@@ -22,7 +22,6 @@
 
 #include "client.h"
 #include "equipment.h"
-#include "event.h"
 #include "eventmanager.h"
 #include "inventory.h"
 #include "listener.h"