Implement feature in bug #395 reported by stealth, and tidy up a bit

[user/henk/code/inspircd.git] / src / modules / m_devoice.cpp

diff --git a/src/modules/m_devoice.cpp b/src/modules/m_devoice.cpp
index 3c21a64f617ebd60e85efea36ccb1c0d8c53fd59..06413f0ec0432206b662b3311bb9cf708c3570d7 100644 (file)
--- 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;
                }
 
@@ -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" DllExport void * init_module( void )
-{
-       return new ModuleDeVoiceFactory;
-}
+MODULE_INIT(ModuleDeVoice)