Simplify working with the event system

EventManager has been merged into Event, with some new convinience methods
added.

Reviewed-by: Chuck Miller

6 files changed, 19 insertions, 19 deletions

diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp
index 71e4efde..147bab0a 100644
--- a/src/net/manaserv/chathandler.cpp
+++ b/src/net/manaserv/chathandler.cpp
@@ -26,7 +26,7 @@
 #include "client.h"
 #include "channel.h"
 #include "channelmanager.h"
-#include "eventmanager.h"
+#include "event.h"
 #include "playerrelations.h"
 
 #include "gui/widgets/channeltab.h"
@@ -171,7 +171,7 @@ void ChatHandler::handleGameChatMessage(Net::MessageIn &msg)
     event.setInt("permissions", player_relations
                  .checkPermissionSilently(being->getName(),
                  PlayerRelation::SPEECH_LOG | PlayerRelation::SPEECH_FLOAT));
-    Mana::EventManager::trigger("Chat", event);
+    event.trigger("Chat");
 }
 
 void ChatHandler::handleEnterChannelResponse(Net::MessageIn &msg)
@@ -234,7 +234,7 @@ void ChatHandler::handlePrivateMessage(Net::MessageIn &msg)
     Mana::Event event("Whisper");
     event.setString("nick", userNick);
     event.setString("message", chatMsg);
-    Mana::EventManager::trigger("Chat", event);
+    event.trigger("Chat");
 }
 
 void ChatHandler::handleAnnouncement(Net::MessageIn &msg)
@@ -242,7 +242,7 @@ void ChatHandler::handleAnnouncement(Net::MessageIn &msg)
     std::string chatMsg = msg.readString();
     Mana::Event event("Announcement");
     event.setString("message", chatMsg);
-    Mana::EventManager::trigger("Chat", event);
+    event.trigger("Chat");
 }
 
 void ChatHandler::handleChatMessage(Net::MessageIn &msg)
diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp
index 750fadda..821d70bd 100644
--- a/src/net/manaserv/guildhandler.cpp
+++ b/src/net/manaserv/guildhandler.cpp
@@ -21,7 +21,7 @@
 
 #include "net/manaserv/guildhandler.h"
 
-#include "eventmanager.h"
+#include "event.h"
 #include "guild.h"
 #include "log.h"
 #include "localplayer.h"
diff --git a/src/net/manaserv/npchandler.cpp b/src/net/manaserv/npchandler.cpp
index 9f63c837..f7e04c1b 100644
--- a/src/net/manaserv/npchandler.cpp
+++ b/src/net/manaserv/npchandler.cpp
@@ -22,7 +22,7 @@
 #include "net/manaserv/npchandler.h"
 
 #include "actorspritemanager.h"
-#include "eventmanager.h"
+#include "event.h"
 
 #include "net/manaserv/connection.h"
 #include "net/manaserv/messagein.h"
@@ -52,7 +52,7 @@ NpcHandler::NpcHandler()
     handledMessages = _messages;
     npcHandler = this;
 
-    Mana::EventManager::bind(this, "NPC");
+    listen("NPC");
 }
 
 void NpcHandler::handleMessage(Net::MessageIn &msg)
@@ -77,7 +77,7 @@ void NpcHandler::handleMessage(Net::MessageIn &msg)
             event->setString("choice" + toString(count), msg.readString());
         }
         event->setInt("choiceCount", count);
-        Mana::EventManager::trigger("NPC", *event);
+        event->trigger("NPC");
         break;
 
     case GPMSG_NPC_NUMBER:
@@ -86,43 +86,43 @@ void NpcHandler::handleMessage(Net::MessageIn &msg)
         event->setInt("min", msg.readInt32());
         event->setInt("max", msg.readInt32());
         event->setInt("default", msg.readInt32());
-        Mana::EventManager::trigger("NPC", *event);
+        event->trigger("NPC");
         break;
 
     case GPMSG_NPC_STRING:
         event = new Mana::Event("StringInput");
         event->setInt("id", npcId);
-        Mana::EventManager::trigger("NPC", *event);
+        event->trigger("NPC");
         break;
 
     case GPMSG_NPC_POST:
         event = new Mana::Event("Post");
         event->setInt("id", npcId);
-        Mana::EventManager::trigger("NPC", *event);
+        event->trigger("NPC");
         break;
 
     case GPMSG_NPC_ERROR:
         event = new Mana::Event("End");
         event->setInt("id", npcId);
-        Mana::EventManager::trigger("NPC", *event);
+        event->trigger("NPC");
         break;
 
     case GPMSG_NPC_MESSAGE:
         event = new Mana::Event("Message");
         event->setInt("id", npcId);
         event->setString("text", msg.readString(msg.getUnreadLength()));
-        Mana::EventManager::trigger("NPC", *event);
+        event->trigger("NPC");
         delete event;
 
         event = new Mana::Event("Next");
         event->setInt("id", npcId);
-        Mana::EventManager::trigger("NPC", *event);
+        event->trigger("NPC");
         break;
 
     case GPMSG_NPC_CLOSE:
         event = new Mana::Event("Close");
         event->setInt("id", npcId);
-        Mana::EventManager::trigger("NPC", *event);
+        event->trigger("NPC");
         break;
     }
 
diff --git a/src/net/manaserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp
index 00bb0fae..370d6496 100644
--- a/src/net/manaserv/partyhandler.cpp
+++ b/src/net/manaserv/partyhandler.cpp
@@ -21,7 +21,7 @@
 
 #include "net/manaserv/partyhandler.h"
 
-#include "eventmanager.h"
+#include "event.h"
 #include "log.h"
 #include "localplayer.h"
 
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index 2028afd9..4957bbbc 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -24,7 +24,7 @@
 
 #include "client.h"
 #include "effectmanager.h"
-#include "eventmanager.h"
+#include "event.h"
 #include "game.h"
 #include "localplayer.h"
 #include "log.h"
@@ -60,7 +60,7 @@ void RespawnRequestListener::action(const gcn::ActionEvent &event)
 {
     Net::getPlayerHandler()->respawn();
 
-    Mana::EventManager::trigger("NPC", Mana::Event("CloseAll"));
+    Mana::Event::trigger("NPC", "CloseAll");
 }
 
 extern Connection *gameServerConnection;
diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp
index a80fc6e6..30ff6890 100644
--- a/src/net/manaserv/tradehandler.cpp
+++ b/src/net/manaserv/tradehandler.cpp
@@ -22,7 +22,7 @@
 #include "net/manaserv/tradehandler.h"
 
 #include "actorspritemanager.h"
-#include "eventmanager.h"
+#include "event.h"
 #include "item.h"
 #include "localplayer.h"
 #include "playerinfo.h"