X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nationalchars.cpp;h=e39a418159b7cd2d414c2dc0739d38cbfb80d084;hb=4b41feea830fc84e8c1b2fd0982f3e8d8840af96;hp=59277bb9e922a79c8fabc9e9f450ae6cec4e8301;hpb=66b90807bb94d88c8a34ec8a1fd7c1558941c47a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index 59277bb9e..e39a41815 100644
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -35,8 +35,8 @@ class lwbNickHandler : public HandlerBase2<bool, const std::string&, size_t>
 {
  public:
 	lwbNickHandler() { }
-	virtual ~lwbNickHandler() { }
-	virtual bool Call(const std::string&, size_t);
+	~lwbNickHandler() { }
+	bool Call(const std::string&, size_t);
 };
 
 								 /*,m_reverse_additionalUp[256];*/
@@ -222,7 +222,6 @@ bool lwbNickHandler::Call(const std::string& nick, size_t max)
 
 class ModuleNationalChars : public Module
 {
- private:
 	lwbNickHandler myhandler;
 	std::string charset, casemapping;
 	unsigned char m_additional[256], m_additionalUp[256], m_lower[256], m_upper[256];
@@ -236,7 +235,7 @@ class ModuleNationalChars : public Module
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		memcpy(m_lower, rfc_case_insensitive_map, 256);
 		national_case_insensitive_map = m_lower;
@@ -248,14 +247,12 @@ class ModuleNationalChars : public Module
 		OnRehash(NULL);
 	}
 
-	virtual void On005Numeric(std::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		std::string tmp(casemapping);
-		tmp.insert(0, "CASEMAPPING=");
-		SearchAndReplace(output, std::string("CASEMAPPING=rfc1459"), tmp);
+		tokens["CASEMAPPING"] = casemapping;
 	}
 
-	virtual void OnRehash(User* user)
+	void OnRehash(User* user) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("nationalchars");
 		charset = tag->getString("file");
@@ -282,14 +279,14 @@ class ModuleNationalChars : public Module
 		}
 	}
 
-	virtual ~ModuleNationalChars()
+	~ModuleNationalChars()
 	{
 		ServerInstance->IsNick = rememberer;
 		national_case_insensitive_map = lowermap_rememberer;
 		CheckForceQuit("National characters module unloaded");
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING", VF_VENDOR | VF_COMMON, charset);
 	}
@@ -308,7 +305,7 @@ class ModuleNationalChars : public Module
 		std::ifstream ifs(filename.c_str());
 		if (ifs.fail())
 		{
-			ServerInstance->Logs->Log("m_nationalchars",DEFAULT,"loadtables() called for missing file: %s", filename.c_str());
+			ServerInstance->Logs->Log("m_nationalchars",LOG_DEFAULT,"loadtables() called for missing file: %s", filename.c_str());
 			return;
 		}
 
@@ -323,7 +320,7 @@ class ModuleNationalChars : public Module
 		{
 			if (loadtable(ifs, tables[n], 255) && (n < faillimit))
 			{
-				ServerInstance->Logs->Log("m_nationalchars",DEFAULT,"loadtables() called for illegal file: %s (line %d)", filename.c_str(), n+1);
+				ServerInstance->Logs->Log("m_nationalchars",LOG_DEFAULT,"loadtables() called for illegal file: %s (line %d)", filename.c_str(), n+1);
 				return;
 			}
 		}