Remove the OnNamesListItem event out of the core.

[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 8485f1d7a450a025bb0aa4ccb134f640e8ad7072..6f47c5743aecbe301a39ad78c07d3ddfd51fa3c0 100644 (file)
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -22,6 +22,8 @@
 
 #include "inspircd.h"
 #include "modules/exemption.h"
+#include "modules/names.h"
+#include "modules/who.h"
 
 class AuditoriumMode : public SimpleChannelModeHandler
 {
@@ -55,7 +57,10 @@ class JoinHook : public ClientProtocol::EventHook
 
 }
 
-class ModuleAuditorium : public Module
+class ModuleAuditorium
+       : public Module
+       , public Names::EventListener
+       , public Who::EventListener
 {
        CheckExemption::EventProvider exemptionprov;
        AuditoriumMode aum;
@@ -66,7 +71,9 @@ class ModuleAuditorium : public Module
 
  public:
        ModuleAuditorium()
-               : exemptionprov(this)
+               : Names::EventListener(this)
+               , Who::EventListener(this)
+               , exemptionprov(this)
                , aum(this)
                , joinhook(this)
        {
@@ -114,7 +121,7 @@ class ModuleAuditorium : public Module
                return false;
        }
 
-       ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
+       ModResult OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
        {
                if (IsVisible(memb))
                        return MOD_RES_PASSTHRU;
@@ -173,7 +180,7 @@ class ModuleAuditorium : public Module
                }
        }
 
-       ModResult OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
+       ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
        {
                if (!memb)
                        return MOD_RES_PASSTHRU;