m_testcommand deletes its command handler manually, no modules should do this. Will...

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

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 7e4d88d9471867bc1091a879b82d03e997bde714..1a49858e2e009276f64101b5ac3c8268adb3db4d 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -13,12 +13,10 @@
 
 // Globops and +g support module by C.J.Edwards
 
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides support for GLOBOPS and user mode +g */
 
@@ -52,7 +50,7 @@ class ModuleGlobops : public Module
        cmd_globops* mycommand;
  public:
        ModuleGlobops(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                mycommand = new cmd_globops(ServerInstance);
                ServerInstance->AddCommand(mycommand);
@@ -75,27 +73,4 @@ class ModuleGlobops : public Module
        }
 };
 
-class ModuleGlobopsFactory : public ModuleFactory
-{
- public:
-       ModuleGlobopsFactory()
-       {
-       }
-       
-       ~ModuleGlobopsFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleGlobops(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleGlobopsFactory;
-}
-
+MODULE_INIT(ModuleGlobops)