Convert more modules

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7347 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index 8d73f94f0f1c4626c97f0d68baea542fceaf1866..20168aff51b6ca981dbc115102a1b40f88e52784 100644 (file)
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -188,26 +188,4 @@ class ModuleAuditorium : public Module
        }
 };
 
-class ModuleAuditoriumFactory : public ModuleFactory
-{
- public:
-       ModuleAuditoriumFactory()
-       {
-       }
-       
-       ~ModuleAuditoriumFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleAuditorium(Me);
-       }
-       
-};
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleAuditoriumFactory;
-}
-
+MODULE_INIT(ModuleAuditorium);

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 5dd406e54fbe5e395a2dcd7b494389bb074c602e..9cb5d066243453a4a5f06a9790407449f8a97a86 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -150,26 +150,4 @@ public:
        }
 };
 
-class ModuleBanExceptionFactory : public ModuleFactory
-{
- public:
-       ModuleBanExceptionFactory()
-       {
-       }
-       
-       ~ModuleBanExceptionFactory()
-       {
-       }
-       
-       virtual Module* CreateModule(InspIRCd* Me)
-       {
-               return new ModuleBanException(Me);
-       }
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleBanExceptionFactory;
-}
-
+MODULE_INIT(ModuleBanException);

diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp
index 7ed690e133b1590cf2c8eba48fd1195d7a904ba9..06b9484c6086143f8fef698969bf1a5814c3337b 100644 (file)
--- a/src/modules/m_banredirect.cpp
+++ b/src/modules/m_banredirect.cpp
@@ -340,26 +340,4 @@ class ModuleBanRedirect : public Module
 };
 
 
-class ModuleBanRedirectFactory : public ModuleFactory
-{
- public:
-       ModuleBanRedirectFactory()
-       {
-       }
-       
-       ~ModuleBanRedirectFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleBanRedirect(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleBanRedirectFactory;
-}
+MODULE_INIT(ModuleBanRedirect);

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 1724f0e5f2592331e0983d043a21e0c2b3c77fbe..0164590bef6cad81a9b0c5a746664dfd11f4643e 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -188,25 +188,4 @@ class ModuleBlockAmsg : public Module
 };
 
 
-class ModuleBlockAmsgFactory : public ModuleFactory
-{
-       public:
-               ModuleBlockAmsgFactory()
-               {
-               }
-       
-               ~ModuleBlockAmsgFactory()
-               {
-               }
-       
-               virtual Module * CreateModule(InspIRCd* Me)
-               {
-                       return new ModuleBlockAmsg(Me);
-               }
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleBlockAmsgFactory;
-}
+MODULE_INIT(ModuleBlockAmsg);

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 2f5807c53c774360345645d79631bb3bf2047050..c07575d3287b5591f62049b445f873338754aadc 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -140,27 +140,4 @@ public:
        }
 };
 
-
-class ModuleBlockCAPSFactory : public ModuleFactory
-{
- public:
-       ModuleBlockCAPSFactory()
-       {
-       }
-       
-       ~ModuleBlockCAPSFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleBlockCAPS(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleBlockCAPSFactory;
-}
+MODULE_INIT(ModuleBlockCAPS);