More conversions

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

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 6dd42209fc8e1b3f88600787ff8078bfdb6f9a81..93048047a6c65bdd24c2ecbc8d05d1dbbcad2e15 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -115,27 +115,4 @@ class ModuleBlockColour : public Module
        }
 };
 
-
-class ModuleBlockColourFactory : public ModuleFactory
-{
- public:
-       ModuleBlockColourFactory()
-       {
-       }
-       
-       ~ModuleBlockColourFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleBlockColour(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleBlockColourFactory;
-}
+MODULE_INIT(ModuleBlockColour);

diff --git a/src/modules/m_botmode.cpp b/src/modules/m_botmode.cpp
index 6e53273aca14d6191f260239202fc372f6962992..646df57a010c260c6e849bc7aa6a7d5abb0426f7 100644 (file)
--- a/src/modules/m_botmode.cpp
+++ b/src/modules/m_botmode.cpp
@@ -91,28 +91,5 @@ class ModuleBotMode : public Module
 
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
 
-class ModuleBotModeFactory : public ModuleFactory
-{
- public:
-       ModuleBotModeFactory()
-       {
-       }
-       
-       ~ModuleBotModeFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleBotMode(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleBotModeFactory;
-}
+MODULE_INIT(ModuleBotMode);

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index df24ddf18c3d00b52c440dc99471a429c2a9f122..35005c741f0579a46c67e04b7f8f645de8ef273f 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -247,26 +247,5 @@ class ModuleCBan : public Module
        }
 };
 
-class ModuleCBanFactory : public ModuleFactory
-{
- public:
-       ModuleCBanFactory()
-       {
-       }
-       
-       ~ModuleCBanFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleCBan(Me);
-       }
-       
-};
+MODULE_INIT(ModuleCBan);
 
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleCBanFactory;
-}

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