X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=e142af0debb80dcbab223344c4169a24374ac46b;hb=1031f333332cf1b09db4fd632f141143ee637c34;hp=de217d2b9a65f9aaa4e33a8811fc225e29fd1f7b;hpb=84a1569cd60daa64b1ae52a1fff62c0dc4d78850;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index de217d2b9..e142af0de 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -22,10 +22,7 @@
 
 
 #include "inspircd.h"
-#include "u_listmode.h"
-
-/* $ModDesc: Provides support for the +e channel mode */
-/* $ModDep: ../../include/u_listmode.h */
+#include "listmode.h"
 
 /* Written by Om<om@inspircd.org>, April 2005. */
 /* Rewritten to use the listmode utility by Om, December 2005 */
@@ -49,36 +46,33 @@ class ModuleBanException : public Module
 {
 	BanException be;
 
-public:
+ public:
 	ModuleBanException() : be(this)
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
-		if (!ServerInstance->Modes->AddMode(&be))
-			throw ModuleException("Could not add new modes!");
+		ServerInstance->Modules->AddService(be);
 
 		be.DoImplements(this);
-		Implementation list[] = { I_OnRehash, I_On005Numeric, I_OnExtBanCheck, I_OnCheckChannelBan };
-		ServerInstance->Modules->Attach(list, this, sizeof(list)/sizeof(Implementation));
 	}
 
-	void On005Numeric(std::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		output.append(" EXCEPTS=e");
+		tokens["EXCEPTS"] = "e";
 	}
 
-	ModResult OnExtBanCheck(User *user, Channel *chan, char type)
+	ModResult OnExtBanCheck(User *user, Channel *chan, char type) CXX11_OVERRIDE
 	{
 		if (chan != NULL)
 		{
-			modelist *list = be.extItem.get(chan);
+			ListModeBase::ModeList *list = be.GetList(chan);
 
 			if (!list)
 				return MOD_RES_PASSTHRU;
 
-			for (modelist::iterator it = list->begin(); it != list->end(); it++)
+			for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
 			{
 				if (it->mask[0] != type || it->mask[1] != ':')
 					continue;
@@ -94,11 +88,11 @@ public:
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnCheckChannelBan(User* user, Channel* chan)
+	ModResult OnCheckChannelBan(User* user, Channel* chan) CXX11_OVERRIDE
 	{
 		if (chan)
 		{
-			modelist *list = be.extItem.get(chan);
+			ListModeBase::ModeList *list = be.GetList(chan);
 
 			if (!list)
 			{
@@ -106,7 +100,7 @@ public:
 				return MOD_RES_PASSTHRU;
 			}
 
-			for (modelist::iterator it = list->begin(); it != list->end(); it++)
+			for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
 			{
 				if (chan->CheckBan(user, it->mask))
 				{
@@ -118,17 +112,17 @@ public:
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
+	void OnSyncChannel(Channel* chan, Module* proto, void* opaque) CXX11_OVERRIDE
 	{
 		be.DoSyncChannel(chan, proto, opaque);
 	}
 
-	void OnRehash(User* user)
+	void OnRehash(User* user) CXX11_OVERRIDE
 	{
 		be.DoRehash();
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides support for the +e channel mode", VF_VENDOR);
 	}