Include explicit routing information in Command, will replace CMD_LOCALONLY return...

[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 5a0a675074f7e32bbe9da3e63c66d85a635e1e51..4800ebac8328bc327e349bcf673f8a408114471e 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -114,21 +114,19 @@ class ModuleHelpop : public Module
 {
        private:
                std::string  h_file;
-               CommandHelpop* mycommand;
-               Helpop* ho;
+               CommandHelpop cmd;
+               Helpop ho;
 
        public:
                ModuleHelpop(InspIRCd* Me)
-                       : Module(Me)
+                       : Module(Me), cmd(Me), ho(Me)
                {
                        ReadConfig();
-                       ho = new Helpop(ServerInstance);
-                       if (!ServerInstance->Modes->AddMode(ho))
+                       if (!ServerInstance->Modes->AddMode(&ho))
                                throw ModuleException("Could not add new modes!");
-                       mycommand = new CommandHelpop(ServerInstance);
-                       ServerInstance->AddCommand(mycommand);
-               Implementation eventlist[] = { I_OnRehash, I_OnWhois };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+                       ServerInstance->AddCommand(&cmd);
+                       Implementation eventlist[] = { I_OnRehash, I_OnWhois };
+                       ServerInstance->Modules->Attach(eventlist, this, 2);
                }
 
                virtual void ReadConfig()
@@ -164,7 +162,7 @@ class ModuleHelpop : public Module
                }
 
 
-               virtual void OnRehash(User* user, const std::string &parameter)
+               virtual void OnRehash(User* user)
                {
                        ReadConfig();
                }
@@ -179,8 +177,7 @@ class ModuleHelpop : public Module
 
                virtual ~ModuleHelpop()
                {
-                       ServerInstance->Modes->DelMode(ho);
-                       delete ho;
+                       ServerInstance->Modes->DelMode(&ho);
                }
 
                virtual Version GetVersion()