Fix mistakenly using Clang instead of GCC on older FreeBSD versions.

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

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index c899d7a4b3b9b15865be7edba3907b8ac3f10195..651e659b59d437bfd468573ffc1a676a0d03c7f5 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -76,20 +76,22 @@ class ModuleChanFilter : public Module
        ModuleChanFilter()
                : cf(this)
        {
-               if (!ServerInstance->Modes->AddMode(&cf))
-                       throw ModuleException("Could not add new modes!");
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(cf);
 
                cf.DoImplements(this);
                Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice, I_OnSyncChannel };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
                OnRehash(NULL);
        }
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader Conf;
-               hidemask = Conf.ReadFlag("chanfilter", "hidemask", 0);
+               hidemask = ServerInstance->Config->ConfValue("chanfilter")->getBool("hidemask");
                cf.DoRehash();
        }
 
@@ -129,11 +131,6 @@ class ModuleChanFilter : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnCleanup(int target_type, void* item)
-       {
-               cf.DoCleanup(target_type, item);
-       }
-
        virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);