Fix iteration of ServerInstance->Users->local_users now that QuitUser can modify...

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

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index c3b31c873c2e7e59bf050fb1f9a70ea338ea062f..bafa3adab88d92a6c5acc9f77323932389091afe 100644 (file)
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -20,9 +20,9 @@
 class User_d : public ModeHandler
 {
  public:
-       User_d(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'd', 0, 0, false, MODETYPE_USER, false) { }
+       User_d(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'd', PARAM_NONE, MODETYPE_USER) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -74,7 +74,7 @@ class ModuleDeaf : public Module
                delete conf;
        }
 
-       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -83,10 +83,10 @@ class ModuleDeaf : public Module
                                this->BuildDeafList(MSG_NOTICE, chan, user, status, text, exempt_list);
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -95,7 +95,7 @@ class ModuleDeaf : public Module
                                this->BuildDeafList(MSG_PRIVMSG, chan, user, status, text, exempt_list);
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text)
@@ -105,7 +105,7 @@ class ModuleDeaf : public Module
 
        virtual void BuildDeafList(MessageType message_type, Channel* chan, User* sender, char status, const std::string &text, CUList &exempt_list)
        {
-               CUList *ulist = chan->GetUsers();
+               const UserMembList *ulist = chan->GetUsers();
                bool is_a_uline;
                bool is_bypasschar, is_bypasschar_avail;
                bool is_bypasschar_uline, is_bypasschar_uline_avail;
@@ -131,7 +131,7 @@ class ModuleDeaf : public Module
                if (!is_bypasschar_uline_avail && is_bypasschar)
                        return;
 
-               for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+               for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
                {
                        /* not +d ? */
                        if (!i->first->IsModeSet('d'))
@@ -152,7 +152,7 @@ class ModuleDeaf : public Module
                                continue;
 
                        /* don't deliver message! */
-                       exempt_list[i->first] = i->first->nick;
+                       exempt_list.insert(i->first);
                }
        }