Remove On005Numeric event from a ton of modules which no longer need it (as CHANMODES...

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

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 05ffd201c7b278da53f6b4103f7434e368a8fe76..dd5e3caf07feef4ab5ea31c42a457bda8c82a749 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -16,22 +16,17 @@
 
 using namespace std;
 
-#include <stdio.h>
-#include <string>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel +S mode (strip ansi colour) */
 
-extern InspIRCd* ServerInstance;
-
 class ChannelStripColor : public ModeHandler
 {
  public:
-       ChannelStripColor() : ModeHandler('S', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       ChannelStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -63,7 +58,7 @@ class ChannelStripColor : public ModeHandler
 class UserStripColor : public ModeHandler
 {
  public:
-       UserStripColor() : ModeHandler('S', 0, 0, false, MODETYPE_USER, false) { }
+       UserStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_USER, false) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -95,34 +90,29 @@ class UserStripColor : public ModeHandler
 
 class ModuleStripColor : public Module
 {
- Server *Srv;
+ 
  ConfigReader *Conf, *MyConf;
  ChannelStripColor *csc;
  UserStripColor *usc;
  
  public:
-       ModuleStripColor(Server* Me)
+       ModuleStripColor(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
+               
 
-               usc = new UserStripColor();
-               csc = new ChannelStripColor();
+               usc = new UserStripColor(ServerInstance);
+               csc = new ChannelStripColor(ServerInstance);
 
-               Srv->AddMode(usc, 'S');
-               Srv->AddMode(csc, 'S');
+               ServerInstance->AddMode(usc, 'S');
+               ServerInstance->AddMode(csc, 'S');
        }
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
        }
 
-       virtual void On005Numeric(std::string &output)
-       {
-               ServerInstance->ModeGrok->InsertMode(output,"S",4);
-       }
-       
        virtual ~ModuleStripColor()
        {
                DELETE(usc);
@@ -230,7 +220,7 @@ class ModuleStripColorFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleStripColor(Me);
        }