More AddModes fixes

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

diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index afb0c3a4b0d040e11bbe087df3e7bab6968f2970..8f47a6432d21a5b47f1f1f38eff4bcd77b59624b 100644 (file)
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 #include "wildcard.h"
 
@@ -21,10 +18,10 @@
 
 /** Handle /CHECK
  */
-class cmd_clones : public command_t
+class CommandClones : public Command
 {
  public:
-       cmd_clones (InspIRCd* Instance) : command_t(Instance,"CLONES", 'o', 1)
+       CommandClones (InspIRCd* Instance) : Command(Instance,"CLONES", 'o', 1)
        {
                this->source = "m_clones.so";
                syntax = "<limit>";
@@ -39,7 +36,7 @@ class cmd_clones : public command_t
                return "<?>";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
 
                std::string clonesstr = "304 " + std::string(user->nick) + " :CLONES";
@@ -72,12 +69,12 @@ class cmd_clones : public command_t
 class ModuleClones : public Module
 {
  private:
-       cmd_clones *mycommand;
+       CommandClones *mycommand;
  public:
        ModuleClones(InspIRCd* Me) : Module(Me)
        {
                
-               mycommand = new cmd_clones(ServerInstance);
+               mycommand = new CommandClones(ServerInstance);
                ServerInstance->AddCommand(mycommand);
        }
        
@@ -97,28 +94,4 @@ class ModuleClones : public Module
        
 };
 
-
-
-class ModuleClonesFactory : public ModuleFactory
-{
- public:
-       ModuleClonesFactory()
-       {
-       }
-       
-       ~ModuleClonesFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleClones(Me);
-       }
-       
-};
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleClonesFactory;
-}
-
+MODULE_INIT(ModuleClones)