5 files changed, 5 insertions, 128 deletions
diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 926b6b03e..f9d41e1eb 100644
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -131,29 +131,5 @@ class ModuleFilter : public FilterBase
 	}
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleFilterFactory : public ModuleFactory
-{
- public:
-	ModuleFilterFactory()
-	{
-	}
-	
-	~ModuleFilterFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleFilter(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleFilterFactory;
-}
 
+MODULE_INIT(ModuleFilter);
diff --git a/src/modules/m_foobar.cpp b/src/modules/m_foobar.cpp
index 0270c1401..49a80a799 100644
--- a/src/modules/m_foobar.cpp
+++ b/src/modules/m_foobar.cpp
@@ -94,37 +94,5 @@ class ModuleFoobar : public Module
 };
 
 
-//
-// The ModuleFoobarFactory class inherits from ModuleFactory
-// and creates a ModuleFoobar object when requested.
-//
-
-class ModuleFoobarFactory : public ModuleFactory
-{
- public:
-	ModuleFoobarFactory()
-	{
-	}
-	
-	~ModuleFoobarFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleFoobar(Me);
-	}
-	
-};
-
-
-//
-// The "C" linkage factory0() function creates the ModuleFoobarFactory
-// class for this library
-//
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleFoobarFactory;
-}
+MODULE_INIT(ModuleFoobar);
 
diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index e8ea11378..c74c1c4c0 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -138,27 +138,4 @@ class ModuleGlobalLoad : public Module
 	}
 };
 
-
-class ModuleGlobalLoadFactory : public ModuleFactory
-{
- public:
-	ModuleGlobalLoadFactory()
-	{
-	}
-	
-	~ModuleGlobalLoadFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleGlobalLoad(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleGlobalLoadFactory;
-}
+MODULE_INIT(ModuleGlobalLoad);
diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 95a1e1e37..87262e4ad 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -73,27 +73,4 @@ class ModuleGlobops : public Module
 	}
 };
 
-class ModuleGlobopsFactory : public ModuleFactory
-{
- public:
-	ModuleGlobopsFactory()
-	{
-	}
-	
-	~ModuleGlobopsFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleGlobops(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleGlobopsFactory;
-}
-
+MODULE_INIT(ModuleGlobops);
diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index d25e2c0bd..2f82f961b 100644
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -188,25 +188,4 @@ class ModuleHelpop : public Module
 		}
 };
 
-class ModuleHelpopFactory : public ModuleFactory
-{
- public:
-	ModuleHelpopFactory()
-	{
-	}
-	
-	~ModuleHelpopFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleHelpop(Me);
-	}
-	
-};
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleHelpopFactory;
-}
+MODULE_INIT(ModuleHelpop);