From 3e5a5e1c669f6027b897f7358d45f92e1552f746 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Wed, 10 Dec 2014 01:29:18 -0500
Subject: Use a triat class for event names instead of having to manually give
 them places, which is much less error prone

---
 modules/pseudoclients/botserv/botserv.cpp   | 18 +++++------
 modules/pseudoclients/chanserv/chanserv.cpp | 42 ++++++++++++-------------
 modules/pseudoclients/global.cpp            |  8 ++---
 modules/pseudoclients/hostserv.cpp          | 10 +++---
 modules/pseudoclients/memoserv/memoserv.cpp | 20 ++++++------
 modules/pseudoclients/nickserv/nickserv.cpp | 48 ++++++++++++++---------------
 modules/pseudoclients/operserv.cpp          | 18 +++++------
 7 files changed, 82 insertions(+), 82 deletions(-)

(limited to 'modules/pseudoclients')

diff --git a/modules/pseudoclients/botserv/botserv.cpp b/modules/pseudoclients/botserv/botserv.cpp
index a2cfe7335..312b2a9d5 100644
--- a/modules/pseudoclients/botserv/botserv.cpp
+++ b/modules/pseudoclients/botserv/botserv.cpp
@@ -30,15 +30,15 @@ class BotServCore : public Module, public BotServ::BotServService
  public:
 	BotServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR)
 		, BotServ::BotServService(this)
-		, EventHook<Event::SetCorrectModes>("OnSetCorrectModes")
-		, EventHook<Event::BotAssign>("OnBotAssign")
-		, EventHook<Event::JoinChannel>("OnJoinChannel")
-		, EventHook<Event::LeaveChannel>("OnLeaveChannel")
-		, EventHook<Event::Help>("Help")
-		, EventHook<Event::ChannelModeSet>("OnChannelModeSet")
-		, EventHook<Event::CreateChan>("OnCreateChan")
-		, EventHook<Event::UserKicked>("OnUserKicked")
-		, EventHook<Event::CreateBot>("OnCreateBot")
+		, EventHook<Event::SetCorrectModes>()
+		, EventHook<Event::BotAssign>()
+		, EventHook<Event::JoinChannel>()
+		, EventHook<Event::LeaveChannel>()
+		, EventHook<Event::Help>()
+		, EventHook<Event::ChannelModeSet>()
+		, EventHook<Event::CreateChan>()
+		, EventHook<Event::UserKicked>()
+		, EventHook<Event::CreateBot>()
 		, persist("PERSIST")
 		, inhabit("inhabit")
 	{
diff --git a/modules/pseudoclients/chanserv/chanserv.cpp b/modules/pseudoclients/chanserv/chanserv.cpp
index bfa7253f8..dbd7f14eb 100644
--- a/modules/pseudoclients/chanserv/chanserv.cpp
+++ b/modules/pseudoclients/chanserv/chanserv.cpp
@@ -59,30 +59,30 @@ class ChanServCore : public Module
  public:
 	ChanServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR)
 		, ChanServService(this)
-		, EventHook<Event::ChannelCreate>("OnChannelCreate")
-		, EventHook<Event::BotDelete>("OnBotDelete")
-		, EventHook<Event::BotPrivmsg>("OnBotPrivmsg")
-		, EventHook<Event::DelCore>("OnDelCore")
-		, EventHook<Event::DelChan>("OnDelChan")
-		, EventHook<Event::Help>("OnHelp")
-		, EventHook<Event::CheckModes>("OnCheckModes")
-		, EventHook<Event::CreateChan>("OnCreateChan")
-		, EventHook<Event::CanSet>("OnCanSet")
-		, EventHook<Event::ChannelSync>("OnChannelSync")
-		, EventHook<Event::Log>("OnLog")
-		, EventHook<Event::ExpireTick>("OnExpireTick")
-		, EventHook<Event::CheckDelete>("OnCheckDelete")
-		, EventHook<Event::PreUplinkSync>("OnPreUplinkSync")
-		, EventHook<Event::ChanRegistered>("OnChanRegistered")
-		, EventHook<Event::JoinChannel>("OnJoinChannel")
-		, EventHook<Event::ChannelModeSet>("OnChannelModeSet")
-		, EventHook<Event::ChanInfo>("OnChanInfo")
-		, EventHook<Event::SetCorrectModes>("OnSetCorrectModes")
+		, EventHook<Event::ChannelCreate>()
+		, EventHook<Event::BotDelete>()
+		, EventHook<Event::BotPrivmsg>()
+		, EventHook<Event::DelCore>()
+		, EventHook<Event::DelChan>()
+		, EventHook<Event::Help>()
+		, EventHook<Event::CheckModes>()
+		, EventHook<Event::CreateChan>()
+		, EventHook<Event::CanSet>()
+		, EventHook<Event::ChannelSync>()
+		, EventHook<Event::Log>()
+		, EventHook<Event::ExpireTick>()
+		, EventHook<Event::CheckDelete>()
+		, EventHook<Event::PreUplinkSync>()
+		, EventHook<Event::ChanRegistered>()
+		, EventHook<Event::JoinChannel>()
+		, EventHook<Event::ChannelModeSet>()
+		, EventHook<Event::ChanInfo>()
+		, EventHook<Event::SetCorrectModes>()
 		, inhabit(this, "inhabit")
 		, persist("PERSIST")
 		, always_lower(false)
-		, OnPreChanExpire(this, "OnPreChanExpire")
-		, OnChanExpire(this, "OnChanExpire")
+		, OnPreChanExpire(this)
+		, OnChanExpire(this)
 		, channel_type(this)
 		, chanaccess_type(this, "ChanAccess")
 		, level_type(this)
diff --git a/modules/pseudoclients/global.cpp b/modules/pseudoclients/global.cpp
index 11dc87146..108495c42 100644
--- a/modules/pseudoclients/global.cpp
+++ b/modules/pseudoclients/global.cpp
@@ -33,10 +33,10 @@ class GlobalCore : public Module
  public:
 	GlobalCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR)
 		, GlobalService(this)
-		, EventHook<Event::Restart>("OnRestart")
-		, EventHook<Event::Shutdown>("OnShutdown")
-		, EventHook<Event::NewServer>("OnNewServer")
-		, EventHook<Event::Help>("OnHelp")
+		, EventHook<Event::Restart>()
+		, EventHook<Event::Shutdown>()
+		, EventHook<Event::NewServer>()
+		, EventHook<Event::Help>()
 	{
 	}
 
diff --git a/modules/pseudoclients/hostserv.cpp b/modules/pseudoclients/hostserv.cpp
index bc9baee43..03fe451d4 100644
--- a/modules/pseudoclients/hostserv.cpp
+++ b/modules/pseudoclients/hostserv.cpp
@@ -25,11 +25,11 @@ class HostServCore : public Module
 
  public:
 	HostServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR)
-		, EventHook<Event::UserLogin>("OnUserLogin")
-		, EventHook<Event::NickUpdate>("OnNickUpdate")
-		, EventHook<Event::Help>("OnHelp")
-		, EventHook<Event::SetVhost>("OnSetVhost")
-		, EventHook<Event::DeleteVhost>("OnDeleteVhost")
+		, EventHook<Event::UserLogin>()
+		, EventHook<Event::NickUpdate>()
+		, EventHook<Event::Help>()
+		, EventHook<Event::SetVhost>()
+		, EventHook<Event::DeleteVhost>()
 	{
 		if (!IRCD || !IRCD->CanSetVHost)
 			throw ModuleException("Your IRCd does not support vhosts");
diff --git a/modules/pseudoclients/memoserv/memoserv.cpp b/modules/pseudoclients/memoserv/memoserv.cpp
index 9d695f553..7952ed637 100644
--- a/modules/pseudoclients/memoserv/memoserv.cpp
+++ b/modules/pseudoclients/memoserv/memoserv.cpp
@@ -62,16 +62,16 @@ class MemoServCore : public Module, public MemoServ::MemoServService
  public:
 	MemoServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR)
 		, MemoServ::MemoServService(this)
-		, EventHook<Event::NickCoreCreate>("OnNickCoreCreate")
-		, EventHook<Event::CreateChan>("OnCreateChan")
-		, EventHook<Event::BotDelete>("OnBotDelete")
-		, EventHook<Event::NickIdentify>("OnNickIdentify")
-		, EventHook<Event::JoinChannel>("OnJoinChannel")
-		, EventHook<Event::UserAway>("OnUserAway")
-		, EventHook<Event::NickUpdate>("OnNickUpdate")
-		, EventHook<Event::Help>("OnHelp")
-		, onmemosend(this, "OnMemoSend")
-		, onmemodel(this, "OnMemoDel")
+		, EventHook<Event::NickCoreCreate>()
+		, EventHook<Event::CreateChan>()
+		, EventHook<Event::BotDelete>()
+		, EventHook<Event::NickIdentify>()
+		, EventHook<Event::JoinChannel>()
+		, EventHook<Event::UserAway>()
+		, EventHook<Event::NickUpdate>()
+		, EventHook<Event::Help>()
+		, onmemosend(this)
+		, onmemodel(this)
 		, memoinfo_type(this)
 		, memo_type(this)
 		, ignore_type(this)
diff --git a/modules/pseudoclients/nickserv/nickserv.cpp b/modules/pseudoclients/nickserv/nickserv.cpp
index 6f215cb86..23652c71d 100644
--- a/modules/pseudoclients/nickserv/nickserv.cpp
+++ b/modules/pseudoclients/nickserv/nickserv.cpp
@@ -154,32 +154,32 @@ class NickServCore : public Module, public NickServ::NickServService
  public:
 	NickServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR)
 		, NickServ::NickServService(this)
-		, EventHook<Event::Shutdown>("OnShutdown")
-		, EventHook<Event::Restart>("OnRestart")
-		, EventHook<Event::UserLogin>("OnUserLogin")
-		, EventHook<Event::DelNick>("OnDelNick")
-		, EventHook<Event::DelCore>("OnDelCore")
-		, EventHook<Event::ChangeCoreDisplay>("OnChangeCoreDisplay")
-		, EventHook<Event::NickIdentify>("OnNickIdentify")
-		, EventHook<Event::NickGroup>("OnNickGroup")
-		, EventHook<Event::NickUpdate>("OnNickUpdate")
-		, EventHook<Event::UserConnect>("OnUserConnect")
-		, EventHook<Event::PostUserLogoff>("OnPostUserLogoff")
-		, EventHook<Event::ServerSync>("OnServerSync")
-		, EventHook<Event::UserNickChange>("OnUserNickChange")
-		, EventHook<Event::UserModeSet>("OnUserModeSet")
-		, EventHook<Event::Help>("OnHelp")
-		, EventHook<Event::ExpireTick>("OnExpireTick")
-		, EventHook<Event::NickInfo>("OnNickInfo")
-		, EventHook<Event::ModuleUnload>("OnModuleUnload")
-		, EventHook<Event::NickCoreCreate>("OnNickCoreCreate")
-		, EventHook<Event::UserQuit>("OnUserQuit")
+		, EventHook<Event::Shutdown>()
+		, EventHook<Event::Restart>()
+		, EventHook<Event::UserLogin>()
+		, EventHook<Event::DelNick>()
+		, EventHook<Event::DelCore>()
+		, EventHook<Event::ChangeCoreDisplay>()
+		, EventHook<Event::NickIdentify>()
+		, EventHook<Event::NickGroup>()
+		, EventHook<Event::NickUpdate>()
+		, EventHook<Event::UserConnect>()
+		, EventHook<Event::PostUserLogoff>()
+		, EventHook<Event::ServerSync>()
+		, EventHook<Event::UserNickChange>()
+		, EventHook<Event::UserModeSet>()
+		, EventHook<Event::Help>()
+		, EventHook<Event::ExpireTick>()
+		, EventHook<Event::NickInfo>()
+		, EventHook<Event::ModuleUnload>()
+		, EventHook<Event::NickCoreCreate>()
+		, EventHook<Event::UserQuit>()
 		, held(this, "HELD")
 		, collided(this, "COLLIDED")
-		, onprenickexpire(this, "OnPreNickExpire")
-		, onnickexpire(this, "OnNickExpire")
-		, onnickregister(this, "OnNickRegister")
-		, onnickvalidate(this, "OnNickValidate")
+		, onprenickexpire(this)
+		, onnickexpire(this)
+		, onnickregister(this)
+		, onnickvalidate(this)
 		, nick_type(this)
 		, account_type(this)
 		, mode_type(this)
diff --git a/modules/pseudoclients/operserv.cpp b/modules/pseudoclients/operserv.cpp
index 5943450f6..4a81686e4 100644
--- a/modules/pseudoclients/operserv.cpp
+++ b/modules/pseudoclients/operserv.cpp
@@ -216,15 +216,15 @@ class OperServCore : public Module
 
  public:
 	OperServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR)
-		, EventHook<Event::BotPrivmsg>("OnBotPrivmsg")
-		, EventHook<Event::ServerQuit>("OnServerQuit")
-		, EventHook<Event::UserModeSet>("OnUserModeSet")
-		, EventHook<Event::UserModeUnset>("OnUserModeUnset")
-		, EventHook<Event::UserConnect>("OnUserConnect")
-		, EventHook<Event::UserNickChange>("OnUserNickChange")
-		, EventHook<Event::CheckKick>("OnCheckKick")
-		, EventHook<Event::Help>("OnHelp")
-		, EventHook<Event::Log>("OnLog")
+		, EventHook<Event::BotPrivmsg>()
+		, EventHook<Event::ServerQuit>()
+		, EventHook<Event::UserModeSet>()
+		, EventHook<Event::UserModeUnset>()
+		, EventHook<Event::UserConnect>()
+		, EventHook<Event::UserNickChange>()
+		, EventHook<Event::CheckKick>()
+		, EventHook<Event::Help>()
+		, EventHook<Event::Log>()
 		, sgtype(this)
 		, sglines(this)
 		, sqtype(this)
-- 
cgit