X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_devoice.cpp;h=06413f0ec0432206b662b3311bb9cf708c3570d7;hb=e9d1efc1ae29ee86b3c2a42bf56531afac7add6d;hp=7400d2212c409b61ce85dfbd685301bb32ff05dc;hpb=9c3a20c15123c4812c236f33418c1fdfe74c3ff2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index 7400d2212..06413f0ec 100644
--- a/src/modules/m_devoice.cpp
+++ b/src/modules/m_devoice.cpp
@@ -18,11 +18,10 @@
 
 /* $ModDesc: Provides voiced users with the ability to devoice themselves. */
 
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /** Handle /DEVOICE
  */
@@ -50,7 +49,7 @@ class cmd_devoice : public command_t
 			ServerInstance->SendMode(modes,3,n);
 			delete n;
 
-			/* route it */
+			/* route it -- SendMode doesn't distribute over the whole network */
 			return CMD_SUCCESS;
 		}
 
@@ -62,7 +61,7 @@ class ModuleDeVoice : public Module
 {
 	cmd_devoice *mycommand;
  public:
-	ModuleDeVoice(InspIRCd* Me) : Module::Module(Me)
+	ModuleDeVoice(InspIRCd* Me) : Module(Me)
 	{
 
 		mycommand = new cmd_devoice(ServerInstance);
@@ -75,31 +74,8 @@ class ModuleDeVoice : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
-	}
-};
-
-
-class ModuleDeVoiceFactory : public ModuleFactory
-{
- public:
-	ModuleDeVoiceFactory()
-	{
+		return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-
-	~ModuleDeVoiceFactory()
-	{
-	}
-
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleDeVoice(Me);
-	}
-
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleDeVoiceFactory;
-}
+MODULE_INIT(ModuleDeVoice)