Pass the ModeHandler to User::HasModePermission()

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

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 40226d0020ea39f171c8aab90519c6a9e3560acf..6f9eeb2522dd833c60e2a1f23390b20c81f3d7aa 100644 (file)
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -103,8 +103,8 @@ class ModuleAuditorium : public Module
                if (IsVisible(memb))
                        return;
 
-               const UserMembList& users = memb->chan->GetUsers();
-               for (UserMembCIter i = users.begin(); i != users.end(); ++i)
+               const Channel::MemberMap& users = memb->chan->GetUsers();
+               for (Channel::MemberMap::const_iterator i = users.begin(); i != users.end(); ++i)
                {
                        if (IS_LOCAL(i->first) && !CanSee(i->first, memb))
                                excepts.insert(i->first);
@@ -140,8 +140,8 @@ class ModuleAuditorium : public Module
                        // this channel should not be considered when listing my neighbors
                        i = include.erase(i);
                        // however, that might hide me from ops that can see me...
-                       const UserMembList& users = memb->chan->GetUsers();
-                       for(UserMembCIter j = users.begin(); j != users.end(); ++j)
+                       const Channel::MemberMap& users = memb->chan->GetUsers();
+                       for(Channel::MemberMap::const_iterator j = users.begin(); j != users.end(); ++j)
                        {
                                if (IS_LOCAL(j->first) && CanSee(j->first, memb))
                                        exception[j->first] = true;
@@ -149,15 +149,15 @@ class ModuleAuditorium : public Module
                }
        }
 
-       void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
+       ModResult OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
        {
                if (!memb)
-                       return;
+                       return MOD_RES_PASSTHRU;
                if (IsVisible(memb))
-                       return;
+                       return MOD_RES_PASSTHRU;
                if (CanSee(source, memb))
-                       return;
-               line.clear();
+                       return MOD_RES_PASSTHRU;
+               return MOD_RES_DENY;
        }
 };