Allow commands to optionally route themselves using ENCAP

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

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index 5ded9bda0e23635870ea1e2134cc11ff23cb5b5d..c86565b5f169661496004b8f41420f67b87e12db 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -206,7 +206,7 @@ class RemoveBase
 class CommandRemove : public Command, public RemoveBase
 {
  public:
-       CommandRemove(InspIRCd* Instance, bool& snk) : Command(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk)
+       CommandRemove(InspIRCd* Instance, bool& snk) : Command(Instance, "REMOVE", 0, 2, 2, false, 0), RemoveBase(Instance, snk)
        {
                this->source = "m_remove.so";
                syntax = "<nick> <channel> [<reason>]";
@@ -238,20 +238,18 @@ class CommandFpart : public Command, public RemoveBase
 
 class ModuleRemove : public Module
 {
-       CommandRemove* mycommand;
-       CommandFpart* mycommand2;
+       CommandRemove cmd1;
+       CommandFpart cmd2;
        bool supportnokicks;
 
 
  public:
        ModuleRemove(InspIRCd* Me)
-       : Module(Me)
+       : Module(Me), cmd1(Me, supportnokicks), cmd2(Me, supportnokicks)
        {
-               mycommand = new CommandRemove(ServerInstance, supportnokicks);
-               mycommand2 = new CommandFpart(ServerInstance, supportnokicks);
-               ServerInstance->AddCommand(mycommand);
-               ServerInstance->AddCommand(mycommand2);
-               OnRehash(NULL,"");
+               ServerInstance->AddCommand(&cmd1);
+               ServerInstance->AddCommand(&cmd2);
+               OnRehash(NULL);
                Implementation eventlist[] = { I_On005Numeric, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
@@ -262,7 +260,7 @@ class ModuleRemove : public Module
                output.append(" REMOVE");
        }
 
-       virtual void OnRehash(User* user, const std::string&)
+       virtual void OnRehash(User* user)
        {
                ConfigReader conf(ServerInstance);
                supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0);
@@ -274,7 +272,7 @@ class ModuleRemove : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 1, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
 };