Attempt to revert r11734

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

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 4800ebac8328bc327e349bcf673f8a408114471e..2ff22d4d34d83cca4c39bdec6bcaa4b274f4915a 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -22,9 +22,12 @@ static std::map<irc::string, std::string> helpop_map;
 class Helpop : public ModeHandler
 {
  public:
-       Helpop(InspIRCd* Instance) : ModeHandler(Instance, 'h', 0, 0, false, MODETYPE_USER, true) { }
+       Helpop(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'h', PARAM_NONE, MODETYPE_USER)
+       {
+               oper = true;
+       }
 
-       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)
                {
@@ -52,9 +55,8 @@ class Helpop : public ModeHandler
 class CommandHelpop : public Command
 {
  public:
-       CommandHelpop (InspIRCd* Instance) : Command(Instance, "HELPOP", 0, 0)
+       CommandHelpop(Module* Creator) : Command(Creator, "HELPOP", 0)
        {
-               this->source = "m_helpop.so";
                syntax = "<any-text>";
        }
 
@@ -119,7 +121,7 @@ class ModuleHelpop : public Module
 
        public:
                ModuleHelpop(InspIRCd* Me)
-                       : Module(Me), cmd(Me), ho(Me)
+                       : Module(Me), cmd(this), ho(Me, this)
                {
                        ReadConfig();
                        if (!ServerInstance->Modes->AddMode(&ho))