Replace all abstract usages of his/he/her with they/their/it.

[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 bb95ecc930685a7b299012bebda28a3250b48842..2b7e66a5038e2bcf9a6791331312de0cebbda0c0 100644 (file)
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -20,18 +20,18 @@
  */
 
 
-/* Contains a code of Unreal IRCd + Bynets patch ( http://www.unrealircd.com/ and http://www.bynets.org/ )
-   Original patch is made by Dmitry "Killer{R}" Kononko. ( http://killprog.com/ )
+/* Contains a code of Unreal IRCd + Bynets patch (https://www.unrealircd.org and https://bynets.org)
+   Original patch is made by Dmitry "Killer{R}" Kononko. (http://killprog.com)
    Changed at 2008-06-15 - 2009-02-11
    by Chernov-Phoenix Alexey (Phoenix@RusNet) mailto:phoenix /email address separator/ pravmail.ru */
 
 #include "inspircd.h"
 #include <fstream>
 
-class lwbNickHandler : public HandlerBase1<bool, const std::string&>
+class lwbNickHandler
 {
  public:
-       bool Call(const std::string&) CXX11_OVERRIDE;
+       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;
        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,7 +258,7 @@ class ModuleNationalChars : public Module
                memcpy(m_lower, rfc_case_insensitive_map, 256);
                national_case_insensitive_map = m_lower;
 
-               ServerInstance->IsNick = &myhandler;
+               ServerInstance->IsNick = &lwbNickHandler::Call;
        }
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE