Merge pull request #574 from SaberUK/master+build-comment-cleanup

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

diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp
index c6dc2d75d963c79755a73c4a23655ef37fa5d21a..e3f8191172f6e119043019297057dc33045d4010 100644 (file)
--- a/src/modules/m_exemptchanops.cpp
+++ b/src/modules/m_exemptchanops.cpp
@@ -18,9 +18,7 @@
 
 
 #include "inspircd.h"
-#include "u_listmode.h"
-
-/* $ModDesc: Provides the ability to allow channel operators to be exempt from certain modes. */
+#include "listmode.h"
 
 /** Handles channel mode +X
  */
@@ -41,10 +39,9 @@ class ExemptChanOps : public ListModeBase
                return true;
        }
 
-       bool TellListTooLong(User* user, Channel* chan, std::string &word)
+       void TellListTooLong(User* user, Channel* chan, std::string &word)
        {
                user->WriteNumeric(959, "%s %s %s :Channel exemptchanops list is full", user->nick.c_str(), chan->name.c_str(), word.c_str());
-               return true;
        }
 
        void TellAlreadyOnList(User* user, Channel* chan, std::string &word)
@@ -63,7 +60,7 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
  public:
        ExemptChanOps ec;
        ExemptHandler(Module* me) : ec(me) {}
-       
+
        ModeHandler* FindMode(const std::string& mid)
        {
                if (mid.length() == 1)
@@ -82,11 +79,11 @@ class ExemptHandler : public HandlerBase3<ModResult, User*, Channel*, const std:
                unsigned int mypfx = chan->GetPrefixValue(user);
                std::string minmode;
 
-               modelist* list = ec.extItem.get(chan);
+               ListModeBase::ModeList* list = ec.GetList(chan);
 
                if (list)
                {
-                       for (modelist::iterator i = list->begin(); i != list->end(); ++i)
+                       for (ListModeBase::ModeList::iterator i = list->begin(); i != list->end(); ++i)
                        {
                                std::string::size_type pos = (*i).mask.find(':');
                                if (pos == std::string::npos)
@@ -112,16 +109,15 @@ class ModuleExemptChanOps : public Module
        ExemptHandler eh;
 
  public:
-
        ModuleExemptChanOps() : eh(this)
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                ServerInstance->Modules->AddService(eh.ec);
                Implementation eventlist[] = { I_OnRehash, I_OnSyncChannel };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                ServerInstance->OnCheckExemption = &eh;
 
                OnRehash(NULL);
@@ -132,17 +128,17 @@ class ModuleExemptChanOps : public Module
                ServerInstance->OnCheckExemption = &ServerInstance->HandleOnCheckExemption;
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR);
        }
 
-       void OnRehash(User* user)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
                eh.ec.DoRehash();
        }
 
-       void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
+       void OnSyncChannel(Channel* chan, Module* proto, void* opaque) CXX11_OVERRIDE
        {
                eh.ec.DoSyncChannel(chan, proto, opaque);
        }