Merge insp20

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

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index cf4144935998decc0e47c49c71df5bfca662a802..e142af0debb80dcbab223344c4169a24374ac46b 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -24,9 +24,6 @@
 #include "inspircd.h"
 #include "listmode.h"
 
-/* $ModDesc: Provides support for the +e channel mode */
-/* $ModDep: ../../include/listmode.h */
-
 /* Written by Om<om@inspircd.org>, April 2005. */
 /* Rewritten to use the listmode utility by Om, December 2005 */
 /* Adapted from m_exception, which was originally based on m_chanprotect and m_silence */
@@ -54,21 +51,19 @@ class ModuleBanException : public Module
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                ServerInstance->Modules->AddService(be);
 
                be.DoImplements(this);
-               Implementation list[] = { I_OnRehash, I_On005Numeric, I_OnExtBanCheck, I_OnCheckChannelBan };
-               ServerInstance->Modules->Attach(list, this, sizeof(list)/sizeof(Implementation));
        }
 
-       void On005Numeric(std::map<std::string, std::string>& tokens)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
                tokens["EXCEPTS"] = "e";
        }
 
-       ModResult OnExtBanCheck(User *user, Channel *chan, char type)
+       ModResult OnExtBanCheck(User *user, Channel *chan, char type) CXX11_OVERRIDE
        {
                if (chan != NULL)
                {
@@ -93,7 +88,7 @@ class ModuleBanException : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnCheckChannelBan(User* user, Channel* chan)
+       ModResult OnCheckChannelBan(User* user, Channel* chan) CXX11_OVERRIDE
        {
                if (chan)
                {
@@ -117,17 +112,17 @@ class ModuleBanException : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
+       void OnSyncChannel(Channel* chan, Module* proto, void* opaque) CXX11_OVERRIDE
        {
                be.DoSyncChannel(chan, proto, opaque);
        }
 
-       void OnRehash(User* user)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
                be.DoRehash();
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for the +e channel mode", VF_VENDOR);
        }