Conversions

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

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index b5cf0c02cab8cdd43659233dde5514cb784dbe9c..7ae7cff6613f979278b14170fba1633d43b77b0c 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -282,28 +282,4 @@ class ModuleJoinFlood : public Module
        }
 };
 
-
-class ModuleJoinFloodFactory : public ModuleFactory
-{
- public:
-       ModuleJoinFloodFactory()
-       {
-       }
-       
-       ~ModuleJoinFloodFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleJoinFlood(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleJoinFloodFactory;
-}
-
+MODULE_INIT(ModuleJoinFlood);

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index c4c58bde5baf7ddb752bb46eedb52d0163bb1fd3..474cedb69c0f7f0a4903d6319843d82a5039c851 100644 (file)
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -161,27 +161,4 @@ class ModuleJumpServer : public Module
        
 };
 
-class ModuleJumpServerFactory : public ModuleFactory
-{
- public:
-       ModuleJumpServerFactory()
-       {
-       }
-       
-       ~ModuleJumpServerFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleJumpServer(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleJumpServerFactory;
-}
-
+MODULE_INIT(ModuleJumpServer);

diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp
index 3fa6c6c60f1a9e5df03561b6c1f2f3f957fb0366..790e8f680e186d01db6617c883c2e2a1b874aae4 100644 (file)
--- a/src/modules/m_kicknorejoin.cpp
+++ b/src/modules/m_kicknorejoin.cpp
@@ -221,27 +221,4 @@ public:
 };
 
 
-class ModuleKickNoRejoinFactory : public ModuleFactory
-{
- public:
-       ModuleKickNoRejoinFactory()
-       {
-       }
-       
-       ~ModuleKickNoRejoinFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleKickNoRejoin(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleKickNoRejoinFactory;
-}
-
+MODULE_INIT(ModuleKickNoRejoin);

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

diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp
index 89ac627de6b5d261a86b815c3e8af8e493504c59..517609fa3d1647f1471453988beebf5e9732554e 100644 (file)
--- a/src/modules/m_lockserv.cpp
+++ b/src/modules/m_lockserv.cpp
@@ -128,24 +128,4 @@ public:
        }
 };
 
-class ModuleLockservFactory : public ModuleFactory
-{
-public:
-       ModuleLockservFactory()
-       {
-       }
-
-       ~ModuleLockservFactory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleLockserv(Me);
-       }
-};
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleLockservFactory;
-}
+MODULE_INIT(ModuleLockserv);

diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp
index ada92df8138894ce1955aff80e04876d19d2daf0..fe3f438291f8029a356b9977cacabeb3caf17a6e 100644 (file)
--- a/src/modules/m_md5.cpp
+++ b/src/modules/m_md5.cpp
@@ -319,27 +319,4 @@ class ModuleMD5 : public Module
        }
 };
 
-
-class ModuleMD5Factory : public ModuleFactory
-{
- public:
-       ModuleMD5Factory()
-       {
-       }
-       
-       ~ModuleMD5Factory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleMD5(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleMD5Factory;
-}
+MODULE_INIT(ModuleMD5);