Conversions

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

diff --git a/src/modules/m_dccallow.cpp b/src/modules/m_dccallow.cpp
index 817057b8719d0776a02140d9f9106d557e2f6f9c..55f035c367995d4242ef84d65448458edb68c953 100644 (file)
--- a/src/modules/m_dccallow.cpp
+++ b/src/modules/m_dccallow.cpp
@@ -486,25 +486,4 @@ class ModuleDCCAllow : public Module
        }
 };
 
-class ModuleDCCAllowFactory : public ModuleFactory
-{
- public:
-       ModuleDCCAllowFactory()
-       {
-       }
-
-       ~ModuleDCCAllowFactory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleDCCAllow(Me);
-       }
-
-};
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleDCCAllowFactory;
-}
+MODULE_INIT(ModuleDCCAllow);

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 20a2e0f3d64d9b9c4ec4b400dd1c6464d2bf9fb3..423fe9c553b4286d38debeaec1e1b4a498685d17 100644 (file)
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -132,28 +132,4 @@ class ModuleDeaf : public Module
 
 };
 
-
-class ModuleDeafFactory : public ModuleFactory
-{
- public:
-       ModuleDeafFactory()
-       {
-       }
-       
-       ~ModuleDeafFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleDeaf(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleDeafFactory;
-}
-
+MODULE_INIT(ModuleDeaf);

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

diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index 37ad8e4c646cac0cab0208393e29d7ab763adf8d..7c1ffe9656a5e078d3bb63305d99462385093208 100644 (file)
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -78,27 +78,4 @@ class ModuleDeVoice : public Module
        }
 };
 
-
-class ModuleDeVoiceFactory : public ModuleFactory
-{
- public:
-       ModuleDeVoiceFactory()
-       {
-       }
-
-       ~ModuleDeVoiceFactory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleDeVoice(Me);
-       }
-
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleDeVoiceFactory;
-}
+MODULE_INIT(ModuleDeVoice);

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 7ff0fcdc35458b4056995d7b6e252a1f27e52cd9..54d2cf6972032d6b6a1ee81c4e40c59e152ff511 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -350,28 +350,4 @@ class ModuleDNSBL : public Module
        }
 };
 
-// stuff down here is the module-factory stuff.
-
-class ModuleDNSBLFactory : public ModuleFactory
-{
- public:
-       ModuleDNSBLFactory()
-       {
-       }
-
-       ~ModuleDNSBLFactory()
-       {
-       }
-
-       virtual Module *CreateModule(InspIRCd *Me)
-       {
-               return new ModuleDNSBL(Me);
-       }
-
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleDNSBLFactory;
-}
+MODULE_INIT(ModuleDNSBL);