From ade1500382366b0cf24147370aea0a3e5bbe50bf Mon Sep 17 00:00:00 2001
From: Attila Molnar <attilamolnar@hush.com>
Date: Mon, 6 Jan 2014 13:37:06 +0100
Subject: Automatically register and unregister mode watchers

---
 src/modules/m_banredirect.cpp | 12 ------------
 src/modules/m_operprefix.cpp  | 12 ------------
 src/modules/m_timedbans.cpp   | 10 ----------
 3 files changed, 34 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 31335ae8f..b0be8d665 100644
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -229,11 +229,6 @@ class ModuleBanRedirect : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modes->AddModeWatcher(&re);
-	}
-
 	void OnCleanup(int target_type, void* item) CXX11_OVERRIDE
 	{
 		if(target_type == TYPE_CHANNEL)
@@ -334,13 +329,6 @@ class ModuleBanRedirect : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	~ModuleBanRedirect()
-	{
-		/* XXX is this the best place to do this? */
-		if (!ServerInstance->Modes->DelModeWatcher(&re))
-			ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Failed to delete modewatcher!");
-	}
-
 	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Allows an extended ban (+b) syntax redirecting banned users to another channel", VF_COMMON|VF_VENDOR);
diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 3d2a34bdb..c84e74892 100644
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -58,17 +58,11 @@ class ModuleOperPrefixMode : public Module
 	ModuleOperPrefixMode()
 		: opm(this), hideoperwatcher(this)
 		, hideopermode(this, "hideoper")
-	{
-	}
-
-	void init() CXX11_OVERRIDE
 	{
 		/* To give clients a chance to learn about the new prefix we don't give +y to opers
 		 * right now. That means if the module was loaded after opers have joined channels
 		 * they need to rejoin them in order to get the oper prefix.
 		 */
-
-		ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
 	}
 
 	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
@@ -98,12 +92,6 @@ class ModuleOperPrefixMode : public Module
 			SetOperPrefix(user, true);
 	}
 
-
-	~ModuleOperPrefixMode()
-	{
-		ServerInstance->Modes->DelModeWatcher(&hideoperwatcher);
-	}
-
 	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp
index 40cc162c1..e3a938336 100644
--- a/src/modules/m_timedbans.cpp
+++ b/src/modules/m_timedbans.cpp
@@ -148,16 +148,6 @@ class ModuleTimedBans : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modes->AddModeWatcher(&banwatcher);
-	}
-
-	~ModuleTimedBans()
-	{
-		ServerInstance->Modes->DelModeWatcher(&banwatcher);
-	}
-
 	void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE
 	{
 		timedbans expired;
-- 
cgit v1.2.3