Make irc::sockets::* parameters consistent, add irc::sockets::mask

[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 af6e962cf582caa27577ab97294e9e7039bf80a4..e8a70d14873b51b626d7620f593c6989171fdbfd 100755 (executable)
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -243,15 +243,14 @@ class ModuleNationalChars : public Module
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader* conf = new ConfigReader;
-               charset = conf->ReadValue("nationalchars", "file", 0);
-               casemapping = conf->ReadValue("nationalchars", "casemapping", charset, 0, false);
+               ConfigReader conf;
+               charset = conf.ReadValue("nationalchars", "file", 0);
+               casemapping = conf.ReadValue("nationalchars", "casemapping", charset, 0, false);
                charset.insert(0, "../locales/");
                unsigned char * tables[8] = { m_additional, m_additionalMB, m_additionalUp, m_lower, m_upper, m_additionalUtf8, m_additionalUtf8range, m_additionalUtf8interval };
                loadtables(charset, tables, 8, 5);
-               forcequit = conf->ReadFlag("nationalchars", "forcequit", 0);
+               forcequit = conf.ReadFlag("nationalchars", "forcequit", 0);
                CheckForceQuit("National character set changed");
-               delete conf;
        }
 
        void CheckForceQuit(const char * message)
@@ -259,7 +258,7 @@ class ModuleNationalChars : public Module
                if (!forcequit)
                        return;
 
-               for (std::vector<User*>::iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter)
+               for (std::vector<LocalUser*>::iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter)
                {
                        /* Fix by Brain: Dont quit UID users */
                        User* n = *iter;