More factory conversion

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

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 3ab2f50be9b8d0b8a0dc2941f5130d7750e4c84e..58c48a2761bc336bee411d9474d6a5ca9313a0b4 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -496,26 +496,4 @@ public:
        
 };
 
-class ModuleCgiIRCFactory : public ModuleFactory
-{
- public:
-       ModuleCgiIRCFactory()
-       {
-       }
-       
-       ~ModuleCgiIRCFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleCgiIRC(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleCgiIRCFactory;
-}
+MODULE_INIT(ModuleCgiIRC);

diff --git a/src/modules/m_chancreate.cpp b/src/modules/m_chancreate.cpp
index ee42a15bf20f0f838d7a95895f78d6eaf296cc31..5c43b3bf15c5db6fbcdd93b594a7927d2518fed5 100644 (file)
--- a/src/modules/m_chancreate.cpp
+++ b/src/modules/m_chancreate.cpp
@@ -52,26 +52,4 @@ class ModuleChanCreate : public Module
        }
 };
 
-class ModuleChanCreateFactory : public ModuleFactory
-{
- public:
-       ModuleChanCreateFactory()
-       {
-       }
-       
-       ~ModuleChanCreateFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleChanCreate(Me);
-       }
-       
-};
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleChanCreateFactory;
-}
-
+MODULE_INIT(ModuleChanCreate);

diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index f7cb81489828049ecf354520725314e11d0f596f..f29b394bc58e0ec99df639630f35a4b036151b5b 100644 (file)
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -152,27 +152,4 @@ class ModuleChanFilter : public Module
        }
 };
 
-
-class ModuleChanFilterFactory : public ModuleFactory
-{
- public:
-       ModuleChanFilterFactory()
-       {
-       }
-       
-       ~ModuleChanFilterFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleChanFilter(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleChanFilterFactory;
-}
+MODULE_INIT(ModuleChanFilter);

diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 93bde94615ee15f11121f426470885ce0723db4b..be7d605ba14a370da289ea8b84002fbbc937c45c 100644 (file)
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -528,27 +528,4 @@ class ModuleChanProtect : public Module
 
 };
 
-
-class ModuleChanProtectFactory : public ModuleFactory
-{
- public:
-       ModuleChanProtectFactory()
-       {
-       }
-       
-       ~ModuleChanProtectFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleChanProtect(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleChanProtectFactory;
-}
+MODULE_INIT(ModuleChanProtect);

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index ba6f65673df971f5d9884867a3059ae1e6b47365..ed808075343d7fa2fa870ce324846ee529ad0241 100644 (file)
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -185,28 +185,4 @@ class ModuleCheck : public Module
        
 };
 
-
-
-class ModuleCheckFactory : public ModuleFactory
-{
- public:
-       ModuleCheckFactory()
-       {
-       }
-       
-       ~ModuleCheckFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleCheck(Me);
-       }
-       
-};
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleCheckFactory;
-}
-
+MODULE_INIT(ModuleCheck);

diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 727495932b41092641fe312792368a0cd7d166a7..c5e114575c090b13efa98923ae363976dd226fa8 100644 (file)
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -111,28 +111,4 @@ class ModuleChgHost : public Module
        
 };
 
-
-class ModuleChgHostFactory : public ModuleFactory
-{
- public:
-       ModuleChgHostFactory()
-       {
-       }
-       
-       ~ModuleChgHostFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleChgHost(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleChgHostFactory;
-}
-
+MODULE_INIT(ModuleChgHost);

diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 740eeadf144e0e1933af8677f39902bdcaa48ba9..21107f1245116c02f95f6c92d4a98f30db4cdad5 100644 (file)
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -76,29 +76,5 @@ public:
        
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleChgIdentFactory : public ModuleFactory
-{
- public:
-       ModuleChgIdentFactory()
-       {
-       }
-       
-       ~ModuleChgIdentFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleChgIdent(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleChgIdentFactory;
-}
+MODULE_INIT(ModuleChgIdent);
 

diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index d25e51426d4f34d4a8879f17c23c7138082e1c42..2e11715268d513f2a41dea5cfcdf8da9b6b4bd29 100644 (file)
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -74,29 +74,4 @@ public:
        
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleChgNameFactory : public ModuleFactory
-{
- public:
-       ModuleChgNameFactory()
-       {
-       }
-       
-       ~ModuleChgNameFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleChgName(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleChgNameFactory;
-}
-
+MODULE_INIT(ModuleChgName);

diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index f729943b41b067748e3ee9af88b8a040ee64f892..e8c108f57c56065dca82de96d73598ed5ad39646 100644 (file)
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -312,28 +312,4 @@ class ModuleCloaking : public Module
        }
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleCloakingFactory : public ModuleFactory
-{
- public:
-       ModuleCloakingFactory()
-       {
-       }
-       
-       ~ModuleCloakingFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleCloaking(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleCloakingFactory;
-}
+MODULE_INIT(ModuleCloaking);

diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 2a974f9ca6e9f28af112067926d9259e59477a30..7c6b127017ba979e8cedc97d1485f7e0409fa0ee 100644 (file)
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -97,28 +97,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);

diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index 524c236f7f310823e2716f5865e70ba477bc2510..d5ddf39be17eb18dbf6475b38444ecc513f5ae1e 100644 (file)
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -92,24 +92,5 @@ class ModuleConnJoin : public Module
 
 };
 
-class ModuleConnJoinFactory : public ModuleFactory
-{
-       public:
-               ModuleConnJoinFactory()
-               {
-               }
-
-               ~ModuleConnJoinFactory()
-               {
-               }
-
-               virtual Module * CreateModule(InspIRCd* Me)
-               {
-                       return new ModuleConnJoin(Me);
-               }
-};
 
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleConnJoinFactory;
-}
+MODULE_INIT(ModuleConnJoin);

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index f1cc8bc6b863a814c0c137dbc9f364a687b8bd92..3b140c4f3eab59d493adead00da388fdb527d8a2 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -101,29 +101,4 @@ class ModuleModesOnConnect : public Module
        }
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleModesOnConnectFactory : public ModuleFactory
-{
- public:
-       ModuleModesOnConnectFactory()
-       {
-       }
-       
-       ~ModuleModesOnConnectFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleModesOnConnect(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleModesOnConnectFactory;
-}
-
+MODULE_INIT(ModuleModesOnConnect);