6 files changed, 6 insertions, 148 deletions
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 432bfbb89..1f6f0cea7 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -287,28 +287,4 @@ class ModuleMsgFlood : public Module
 	}
 };
 
-
-class ModuleMsgFloodFactory : public ModuleFactory
-{
- public:
-	ModuleMsgFloodFactory()
-	{
-	}
-	
-	~ModuleMsgFloodFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleMsgFlood(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleMsgFloodFactory;
-}
-
+MODULE_INIT(ModuleMsgFlood);
diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index de2f3f859..fa012564c 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -124,27 +124,4 @@ class ModuleNamesX : public Module
  	}
 };
 
-
-class ModuleNamesXFactory : public ModuleFactory
-{
- public:
-	ModuleNamesXFactory()
-	{
-	}
-
-	~ModuleNamesXFactory()
-	{
-	}
-
-		virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleNamesX(Me);
-	}
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleNamesXFactory;
-}
-
+MODULE_INIT(ModuleNamesX);
diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp
index 071eda8ee..e42d9df83 100644
--- a/src/modules/m_nicklock.cpp
+++ b/src/modules/m_nicklock.cpp
@@ -156,29 +156,4 @@ class ModuleNickLock : public Module
 	}
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleNickLockFactory : public ModuleFactory
-{
- public:
-	ModuleNickLockFactory()
-	{
-	}
-	
-	~ModuleNickLockFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleNickLock(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleNickLockFactory;
-}
-
+MODULE_INIT(ModuleNickLock);
diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index c9ed1297c..713b054d5 100644
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -104,28 +104,4 @@ class ModuleNoCTCP : public Module
 	}
 };
 
-
-class ModuleNoCTCPFactory : public ModuleFactory
-{
- public:
-	ModuleNoCTCPFactory()
-	{
-	}
-	
-	~ModuleNoCTCPFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleNoCTCP(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleNoCTCPFactory;
-}
-
+MODULE_INIT(ModuleNoCTCP);
diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index 219c1c78f..83331ed8e 100644
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -85,27 +85,4 @@ class ModuleNoInvite : public Module
 	}
 };
 
-
-class ModuleNoInviteFactory : public ModuleFactory
-{
- public:
-	ModuleNoInviteFactory()
-	{
-	}
-
-	~ModuleNoInviteFactory()
-	{
-	}
-
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleNoInvite(Me);
-	}
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleNoInviteFactory;
-}
-
+MODULE_INIT(ModuleNoInvite);
diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index e5a37ed62..216fa3ae2 100644
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -102,27 +102,4 @@ class ModuleNoKicks : public Module
 };
 
 
-class ModuleNoKicksFactory : public ModuleFactory
-{
- public:
-	ModuleNoKicksFactory()
-	{
-	}
-	
-	~ModuleNoKicksFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleNoKicks(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleNoKicksFactory;
-}
-
+MODULE_INIT(ModuleNoKicks);