Merge pull request #514 from SaberUK/master+virtual-cleanup

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

diff --git a/src/modules/m_autoop.cpp b/src/modules/m_autoop.cpp
index a8f6f8d1e0c73e50a8e43273949edd342df1eafb..85b14ba7ad6dfdfb1dac8782f292635b316911ae 100644 (file)
--- a/src/modules/m_autoop.cpp
+++ b/src/modules/m_autoop.cpp
@@ -19,7 +19,7 @@
 
 
 #include "inspircd.h"
-#include "u_listmode.h"
+#include "listmode.h"
 
 /* $ModDesc: Provides support for the +w channel mode, autoop list */
 
@@ -87,7 +87,7 @@ class ModuleAutoOp : public Module
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                ServerInstance->Modules->AddService(mh);
                mh.DoImplements(this);
@@ -96,18 +96,18 @@ class ModuleAutoOp : public Module
                ServerInstance->Modules->Attach(list, this, sizeof(list)/sizeof(Implementation));
        }
 
-       void OnPostJoin(Membership *memb)
+       void OnPostJoin(Membership *memb) CXX11_OVERRIDE
        {
                if (!IS_LOCAL(memb->user))
                        return;
 
-               modelist* list = mh.extItem.get(memb->chan);
+               ListModeBase::ModeList* list = mh.GetList(memb->chan);
                if (list)
                {
                        std::string modeline("+");
                        std::vector<std::string> modechange;
                        modechange.push_back(memb->chan->name);
-                       for (modelist::iterator it = list->begin(); it != list->end(); it++)
+                       for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
                        {
                                std::string::size_type colon = it->mask.find(':');
                                if (colon == std::string::npos)
@@ -127,17 +127,17 @@ class ModuleAutoOp : public Module
                }
        }
 
-       void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
+       void OnSyncChannel(Channel* chan, Module* proto, void* opaque) CXX11_OVERRIDE
        {
                mh.DoSyncChannel(chan, proto, opaque);
        }
 
-       void OnRehash(User* user)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
                mh.DoRehash();
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for the +w channel mode", VF_VENDOR);
        }