Fix for bug #415, affects only trunk (wish i'd known this before i started!)

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

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 31d423996a76cd974644b84efc50cf3fd864a0a3..fdec61a7ef5c420bc8b00897e5c0eb08a7bf6fa8 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +T */
@@ -53,7 +50,7 @@ class ModuleNoNotice : public Module
  public:
  
        ModuleNoNotice(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                nt = new NoNotice(ServerInstance);
@@ -91,7 +88,7 @@ class ModuleNoNotice : public Module
        virtual ~ModuleNoNotice()
        {
                ServerInstance->Modes->DelMode(nt);
-               DELETE(nt);
+               delete nt;
        }
        
        virtual Version GetVersion()
@@ -100,28 +97,4 @@ class ModuleNoNotice : public Module
        }
 };
 
-
-class ModuleNoNoticeFactory : public ModuleFactory
-{
- public:
-       ModuleNoNoticeFactory()
-       {
-       }
-       
-       ~ModuleNoNoticeFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleNoNotice(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleNoNoticeFactory;
-}
-
+MODULE_INIT(ModuleNoNotice)