Change channel name parameter of Module::OnUserPreJoin() and Channel::JoinUser()...

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

diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index c6c5037e9c1a4208c0b76c9a9fe1822f21f0fd8e..b0ca38555e24a32ad382a56e554faacace76d4b4 100644 (file)
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -86,7 +86,7 @@ class ModuleOperPrefixMode : public Module
                ServerInstance->Modules->AddService(opm);
 
                Implementation eventlist[] = { I_OnUserPreJoin, I_OnPostOper, I_OnLoadModule, I_OnUnloadModule };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
                /* To give clients a chance to learn about the new prefix we don't give +y to opers
                 * right now. That means if the module was loaded after opers have joined channels
@@ -97,7 +97,7 @@ class ModuleOperPrefixMode : public Module
                        mw_added = ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
        }
 
-       ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string& privs, const std::string& keygiven)
+       ModResult OnUserPreJoin(User* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven)
        {
                /* The user may have the +H umode on himself, but +H does not necessarily correspond
                 * to the +H of m_hideoper.