Use CommandBase::Params instead of std::vector<std::string>.

[user/henk/code/inspircd.git] / src / modules / m_nationalchars.cpp

diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
index 8e836c407d59e3e0be3c810b787439c1e3e0322d..81c2d2959f0fce348f93500a6266fc0c4a66070c 100644 (file)
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -28,10 +28,10 @@
 #include "inspircd.h"
 #include <fstream>
 
-class lwbNickHandler : public HandlerBase1<bool, const std::string&>
+class lwbNickHandler
 {
  public:
-       bool Call(const std::string&);
+       static bool Call(const std::string&);
 };
 
                                                                 /*,m_reverse_additionalUp[256];*/
@@ -217,10 +217,9 @@ bool lwbNickHandler::Call(const std::string& nick)
 
 class ModuleNationalChars : public Module
 {
-       lwbNickHandler myhandler;
-       std::string charset, casemapping;
+       std::string charset;
        unsigned char m_additional[256], m_additionalUp[256], m_lower[256], m_upper[256];
-       caller1<bool, const std::string&> rememberer;
+       TR1NS::function<bool(const std::string&)> rememberer;
        bool forcequit;
        const unsigned char * lowermap_rememberer;
        unsigned char prev_map[256];
@@ -259,21 +258,17 @@ class ModuleNationalChars : public Module
                memcpy(m_lower, rfc_case_insensitive_map, 256);
                national_case_insensitive_map = m_lower;
 
-               ServerInstance->IsNick = &myhandler;
-       }
-
-       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
-       {
-               tokens["CASEMAPPING"] = casemapping;
+               ServerInstance->IsNick = &lwbNickHandler::Call;
        }
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("nationalchars");
                charset = tag->getString("file");
-               casemapping = tag->getString("casemapping", FileSystem::GetFileName(charset));
+               std::string casemapping = tag->getString("casemapping", FileSystem::GetFileName(charset));
                if (casemapping.find(' ') != std::string::npos)
                        throw ModuleException("<nationalchars:casemapping> must not contain any spaces!");
+               ServerInstance->Config->CaseMapping = casemapping;
 #if defined _WIN32
                if (!FileSystem::StartsWithWindowsDriveLetter(charset))
                        charset.insert(0, "./locales/");