dz is determined to crash your ircd :P

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

diff --git a/src/modules/m_services_account.cpp b/src/modules/m_services_account.cpp
index 27d9b335e14b9a91beb5003c93e616e2ea031b4f..74e4453762a9ad132b1cd9758890d2c55fd33462 100644 (file)
--- a/src/modules/m_services_account.cpp
+++ b/src/modules/m_services_account.cpp
@@ -12,10 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "hashcomp.h"
 
 /* $ModDesc: Povides support for ircu-style services accounts, including chmode +R, etc. */
 
@@ -318,9 +314,9 @@ class ModuleServicesAccount : public Module
                ServerInstance->Modes->DelMode(m1);
                ServerInstance->Modes->DelMode(m2);
                ServerInstance->Modes->DelMode(m3);
-               DELETE(m1);
-               DELETE(m2);
-               DELETE(m3);
+               delete m1;
+               delete m2;
+               delete m3;
        }
        
        virtual Version GetVersion()
@@ -329,27 +325,4 @@ class ModuleServicesAccount : public Module
        }
 };
 
-
-class ModuleServicesAccountFactory : public ModuleFactory
-{
- public:
-       ModuleServicesAccountFactory()
-       {
-       }
-       
-       ~ModuleServicesAccountFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleServicesAccount(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleServicesAccountFactory;
-}
+MODULE_INIT(ModuleServicesAccount)