X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sajoin.cpp;h=75e01704409a2a16e9063e72b771ad857194f23f;hb=b7e299c2e10d915d5e59df4cb3f54951c8daa999;hp=b91b1a2f00063deac016c562b373840b04543752;hpb=e295d91ffd44876a9ae5279269d5a4ca4e15afcc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sajoin.cpp b/src/modules/m_sajoin.cpp
index b91b1a2f0..75e017044 100644
--- a/src/modules/m_sajoin.cpp
+++ b/src/modules/m_sajoin.cpp
@@ -11,14 +11,11 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 
-#include "inspircd.h"
-
 /* $ModDesc: Provides support for unreal-style SAJOIN command */
 
 /** Handle /SAJOIN
@@ -96,7 +93,7 @@ class ModuleSajoin : public Module
 	cmd_sajoin*	mycommand;
  public:
 	ModuleSajoin(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		mycommand = new cmd_sajoin(ServerInstance);
@@ -109,34 +106,9 @@ class ModuleSajoin : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
-	}
-	
-};
-
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSajoinFactory : public ModuleFactory
-{
- public:
-	ModuleSajoinFactory()
-	{
-	}
-	
-	~ModuleSajoinFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSajoin(Me);
+		return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleSajoinFactory;
-}
-
+MODULE_INIT(ModuleSajoin)