More factory conversion

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

12 files changed, 12 insertions, 291 deletions

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 3ab2f50be..58c48a276 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -496,26 +496,4 @@ public:
 	
 };
 
-class ModuleCgiIRCFactory : public ModuleFactory
-{
- public:
-	ModuleCgiIRCFactory()
-	{
-	}
-	
-	~ModuleCgiIRCFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleCgiIRC(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleCgiIRCFactory;
-}
+MODULE_INIT(ModuleCgiIRC);
diff --git a/src/modules/m_chancreate.cpp b/src/modules/m_chancreate.cpp
index ee42a15bf..5c43b3bf1 100644
--- a/src/modules/m_chancreate.cpp
+++ b/src/modules/m_chancreate.cpp
@@ -52,26 +52,4 @@ class ModuleChanCreate : public Module
 	}
 };
 
-class ModuleChanCreateFactory : public ModuleFactory
-{
- public:
-	ModuleChanCreateFactory()
-	{
-	}
-	
-	~ModuleChanCreateFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleChanCreate(Me);
-	}
-	
-};
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleChanCreateFactory;
-}
-
+MODULE_INIT(ModuleChanCreate);
diff --git a/src/modules/m_chanfilter.cpp b/src/modules/m_chanfilter.cpp
index f7cb81489..f29b394bc 100644
--- a/src/modules/m_chanfilter.cpp
+++ b/src/modules/m_chanfilter.cpp
@@ -152,27 +152,4 @@ class ModuleChanFilter : public Module
 	}
 };
 
-
-class ModuleChanFilterFactory : public ModuleFactory
-{
- public:
-	ModuleChanFilterFactory()
-	{
-	}
-	
-	~ModuleChanFilterFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleChanFilter(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleChanFilterFactory;
-}
+MODULE_INIT(ModuleChanFilter);
diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp
index 93bde9461..be7d605ba 100644
--- a/src/modules/m_chanprotect.cpp
+++ b/src/modules/m_chanprotect.cpp
@@ -528,27 +528,4 @@ class ModuleChanProtect : public Module
 
 };
 
-
-class ModuleChanProtectFactory : public ModuleFactory
-{
- public:
-	ModuleChanProtectFactory()
-	{
-	}
-	
-	~ModuleChanProtectFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleChanProtect(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleChanProtectFactory;
-}
+MODULE_INIT(ModuleChanProtect);
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index ba6f65673..ed8080753 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -185,28 +185,4 @@ class ModuleCheck : public Module
 	
 };
 
-
-
-class ModuleCheckFactory : public ModuleFactory
-{
- public:
-	ModuleCheckFactory()
-	{
-	}
-	
-	~ModuleCheckFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleCheck(Me);
-	}
-	
-};
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleCheckFactory;
-}
-
+MODULE_INIT(ModuleCheck);
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp
index 727495932..c5e114575 100644
--- a/src/modules/m_chghost.cpp
+++ b/src/modules/m_chghost.cpp
@@ -111,28 +111,4 @@ class ModuleChgHost : public Module
 	
 };
 
-
-class ModuleChgHostFactory : public ModuleFactory
-{
- public:
-	ModuleChgHostFactory()
-	{
-	}
-	
-	~ModuleChgHostFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleChgHost(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleChgHostFactory;
-}
-
+MODULE_INIT(ModuleChgHost);
diff --git a/src/modules/m_chgident.cpp b/src/modules/m_chgident.cpp
index 740eeadf1..21107f124 100644
--- a/src/modules/m_chgident.cpp
+++ b/src/modules/m_chgident.cpp
@@ -76,29 +76,5 @@ public:
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleChgIdentFactory : public ModuleFactory
-{
- public:
-	ModuleChgIdentFactory()
-	{
-	}
-	
-	~ModuleChgIdentFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleChgIdent(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleChgIdentFactory;
-}
+MODULE_INIT(ModuleChgIdent);
 
diff --git a/src/modules/m_chgname.cpp b/src/modules/m_chgname.cpp
index d25e51426..2e1171526 100644
--- a/src/modules/m_chgname.cpp
+++ b/src/modules/m_chgname.cpp
@@ -74,29 +74,4 @@ public:
 	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleChgNameFactory : public ModuleFactory
-{
- public:
-	ModuleChgNameFactory()
-	{
-	}
-	
-	~ModuleChgNameFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleChgName(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleChgNameFactory;
-}
-
+MODULE_INIT(ModuleChgName);
diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index f729943b4..e8c108f57 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -312,28 +312,4 @@ class ModuleCloaking : public Module
 	}
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleCloakingFactory : public ModuleFactory
-{
- public:
-	ModuleCloakingFactory()
-	{
-	}
-	
-	~ModuleCloakingFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleCloaking(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleCloakingFactory;
-}
+MODULE_INIT(ModuleCloaking);
diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 2a974f9ca..7c6b12701 100644
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -97,28 +97,4 @@ class ModuleClones : public Module
 	
 };
 
-
-
-class ModuleClonesFactory : public ModuleFactory
-{
- public:
-	ModuleClonesFactory()
-	{
-	}
-	
-	~ModuleClonesFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleClones(Me);
-	}
-	
-};
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleClonesFactory;
-}
-
+MODULE_INIT(ModuleClones);
diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp
index 524c236f7..d5ddf39be 100644
--- a/src/modules/m_conn_join.cpp
+++ b/src/modules/m_conn_join.cpp
@@ -92,24 +92,5 @@ class ModuleConnJoin : public Module
 
 };
 
-class ModuleConnJoinFactory : public ModuleFactory
-{
-	public:
-		ModuleConnJoinFactory()
-		{
-		}
-
-		~ModuleConnJoinFactory()
-		{
-		}
-
-		virtual Module * CreateModule(InspIRCd* Me)
-		{
-			return new ModuleConnJoin(Me);
-		}
-};
 
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleConnJoinFactory;
-}
+MODULE_INIT(ModuleConnJoin);
diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index f1cc8bc6b..3b140c4f3 100644
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -101,29 +101,4 @@ class ModuleModesOnConnect : public Module
 	}
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleModesOnConnectFactory : public ModuleFactory
-{
- public:
-	ModuleModesOnConnectFactory()
-	{
-	}
-	
-	~ModuleModesOnConnectFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleModesOnConnect(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleModesOnConnectFactory;
-}
-
+MODULE_INIT(ModuleModesOnConnect);