Allow serializable fields to use storage in the respective objects.

Split service management code nito a proper servicemanager. Make service
references managed instead of lazy lookup. Also made events and
serializable use service manager instead of their respective systems for
management

1 files changed, 3 insertions, 7 deletions

diff --git a/modules/chanserv/drop.cpp b/modules/chanserv/drop.cpp
index cb2036694..bbda47dbf 100644
--- a/modules/chanserv/drop.cpp
+++ b/modules/chanserv/drop.cpp
@@ -14,10 +14,8 @@
 
 class CommandCSDrop : public Command
 {
-	EventHandlers<Event::ChanDrop> &onchandrop;
-
  public:
-	CommandCSDrop(Module *creator, EventHandlers<Event::ChanDrop> &event) : Command(creator, "chanserv/drop", 1, 2), onchandrop(event)
+	CommandCSDrop(Module *creator) : Command(creator, "chanserv/drop", 1, 2)
 	{
 		this->SetDesc(_("Cancel the registration of a channel"));
 		this->SetSyntax(_("\037channel\037 \037channel\037"));
@@ -52,7 +50,7 @@ class CommandCSDrop : public Command
 			return;
 		}
 
-		EventReturn MOD_RESULT = this->onchandrop(&Event::ChanDrop::OnChanDrop, source, ci);
+		EventReturn MOD_RESULT = EventManager::Get()->Dispatch(&Event::ChanDrop::OnChanDrop, source, ci);
 		if (MOD_RESULT == EVENT_STOP)
 			return;
 
@@ -87,12 +85,10 @@ class CommandCSDrop : public Command
 class CSDrop : public Module
 {
 	CommandCSDrop commandcsdrop;
-	EventHandlers<Event::ChanDrop> onchandrop;
 
  public:
 	CSDrop(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR)
-		, commandcsdrop(this, onchandrop)
-		, onchandrop(this)
+		, commandcsdrop(this)
 	{
 
 	}