This will royally fuck 1.2's linking right now, but..

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

diff --git a/src/modules/m_silence_ext.cpp b/src/modules/m_silence_ext.cpp
index e58e626c71f7464b36da365549c80f548d1c6408..1bb3b26e519ac96e97ff3cd01ed8676493b2fe3c 100644 (file)
--- a/src/modules/m_silence_ext.cpp
+++ b/src/modules/m_silence_ext.cpp
@@ -11,15 +11,11 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include <stdarg.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "hashcomp.h"
-#include "inspircd.h"
 #include "wildcard.h"
 
 /* $ModDesc: Provides support for the /SILENCE command */
@@ -243,7 +239,7 @@ class ModuleSilence : public Module
  public:
  
        ModuleSilence(InspIRCd* Me)
-               : Module::Module(Me), maxsilence(32)
+               : Module(Me), maxsilence(32)
        {
                OnRehash(NULL, "");
                mycommand = new cmd_silence(ServerInstance,maxsilence);
@@ -369,32 +365,8 @@ class ModuleSilence : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
-
-class ModuleSilenceFactory : public ModuleFactory
-{
- public:
-       ModuleSilenceFactory()
-       {
-       }
-       
-       ~ModuleSilenceFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleSilence(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSilenceFactory;
-}
-
+MODULE_INIT(ModuleSilence)