X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_blockamsg.cpp;h=3521bd89d1957c6398cd8cc6e8892da79d2ba775;hb=24623a5fe6ff986ad342e2b00d3576b4899a6033;hp=b0001574a0dfee2bd5360371d3c4a76d091ea60a;hpb=ac7defcd3e52695dcf5e5150e9fe3e1624205e64;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index b0001574a..3521bd89d 100644
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -23,8 +23,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Attempt to block /amsg, at least some of the irritating mIRC scripts. */
-
 enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOPERS, IBLOCK_SILENT };
 /*	IBLOCK_NOTICE		- Send a notice to the user informing them of what happened.
  *	IBLOCK_NOTICEOPERS	- Send a notice to the user informing them and send an oper notice.
@@ -37,7 +35,7 @@ enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOP
  */
 class BlockedMessage
 {
-public:
+ public:
 	std::string message;
 	irc::string target;
 	time_t sent;
@@ -59,24 +57,20 @@ class ModuleBlockAmsg : public Module
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		this->OnRehash(NULL);
-		ServerInstance->Extensions.Register(&blockamsg);
+		ServerInstance->Modules->AddService(blockamsg);
 		Implementation eventlist[] = { I_OnRehash, I_OnPreCommand };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
-	}
-
-	virtual ~ModuleBlockAmsg()
-	{
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Attempt to block /amsg, at least some of the irritating mIRC scripts.",VF_VENDOR);
 	}
 
-	virtual void OnRehash(User* user)
+	void OnRehash(User* user) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("blockamsg");
 		ForgetDelay = tag->getInt("delay", -1);
@@ -94,7 +88,7 @@ class ModuleBlockAmsg : public Module
 			action = IBLOCK_KILLOPERS;
 	}
 
-	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
+	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
 	{
 		// Don't do anything with unregistered users
 		if (user->registered != REG_ALL)
@@ -169,5 +163,4 @@ class ModuleBlockAmsg : public Module
 	}
 };
 
-
 MODULE_INIT(ModuleBlockAmsg)