X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_override.cpp;h=a653dd33eef84416bc000a58f4fb08d71392b17e;hb=f2cdf27dd9c45f91f4184b81ea3b9be7c5d88173;hp=394c770d7b6213605786446963590833137a44fb;hpb=988d8218071b504521bd1da6c2275db877d857b9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_override.cpp b/src/modules/m_override.cpp
index 394c770d7..a653dd33e 100644
--- a/src/modules/m_override.cpp
+++ b/src/modules/m_override.cpp
@@ -35,7 +35,7 @@ class ModuleOverride : public Module
 
  public:
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		// read our config options (main config file)
 		OnRehash(NULL);
@@ -44,7 +44,7 @@ class ModuleOverride : public Module
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	void OnRehash(User* user)
+	void OnRehash(User* user) CXX11_OVERRIDE
 	{
 		// re-read our config options on a rehash
 		ConfigTag* tag = ServerInstance->Config->ConfValue("override");
@@ -52,7 +52,7 @@ class ModuleOverride : public Module
 		RequireKey = tag->getBool("requirekey");
 	}
 
-	void On005Numeric(std::map<std::string, std::string>& tokens)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
 		tokens["OVERRIDE"];
 	}
@@ -66,7 +66,7 @@ class ModuleOverride : public Module
 	}
 
 
-	ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic)
+	ModResult OnPreTopicChange(User *source, Channel *channel, const std::string &topic) CXX11_OVERRIDE
 	{
 		if (IS_LOCAL(source) && source->IsOper() && CanOverride(source, "TOPIC"))
 		{
@@ -82,7 +82,7 @@ class ModuleOverride : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason)
+	ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) CXX11_OVERRIDE
 	{
 		if (source->IsOper() && CanOverride(source,"KICK"))
 		{
@@ -96,7 +96,7 @@ class ModuleOverride : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters)
+	ModResult OnPreMode(User* source,User* dest,Channel* channel, const std::vector<std::string>& parameters) CXX11_OVERRIDE
 	{
 		if (!source || !channel)
 			return MOD_RES_PASSTHRU;
@@ -116,7 +116,7 @@ class ModuleOverride : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven)
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
 		if (user->IsOper())
 		{
@@ -129,7 +129,7 @@ class ModuleOverride : public Module
 						if (RequireKey && keygiven != "override")
 						{
 							// Can't join normally -- must use a special key to bypass restrictions
-							user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str());
+							user->WriteNotice("*** You may not join normally. You must join with a key of 'override' to oper override.");
 							return MOD_RES_PASSTHRU;
 						}
 
@@ -145,7 +145,7 @@ class ModuleOverride : public Module
 					if (RequireKey && keygiven != "override")
 					{
 						// Can't join normally -- must use a special key to bypass restrictions
-						user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str());
+						user->WriteNotice("*** You may not join normally. You must join with a key of 'override' to oper override.");
 						return MOD_RES_PASSTHRU;
 					}
 
@@ -160,7 +160,7 @@ class ModuleOverride : public Module
 					if (RequireKey && keygiven != "override")
 					{
 						// Can't join normally -- must use a special key to bypass restrictions
-						user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str());
+						user->WriteNotice("*** You may not join normally. You must join with a key of 'override' to oper override.");
 						return MOD_RES_PASSTHRU;
 					}
 
@@ -175,7 +175,7 @@ class ModuleOverride : public Module
 					if (RequireKey && keygiven != "override")
 					{
 						// Can't join normally -- must use a special key to bypass restrictions
-						user->WriteServ("NOTICE %s :*** You may not join normally. You must join with a key of 'override' to oper override.", user->nick.c_str());
+						user->WriteNotice("*** You may not join normally. You must join with a key of 'override' to oper override.");
 						return MOD_RES_PASSTHRU;
 					}
 
@@ -189,7 +189,7 @@ class ModuleOverride : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides support for allowing opers to override certain things",VF_VENDOR);
 	}