code tidyups

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

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 99887952cf69604a2bdc4bc650ced9d570ebbbb5..37492f670ca504d074e286a1d4f3efa40ac29da9 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -22,7 +22,7 @@ class SeeWhois : public ModeHandler
  public:
        SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, true) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                /* Only opers can change other users modes */
                if (source != dest)
@@ -60,7 +60,7 @@ class ModuleShowwhois : public Module
        {
                
                sw = new SeeWhois(ServerInstance);
-               if (!ServerInstance->AddMode(sw))
+               if (!ServerInstance->Modes->AddMode(sw))
                        throw ModuleException("Could not add new modes!");
                Implementation eventlist[] = { I_OnWhois };
                ServerInstance->Modules->Attach(eventlist, this, 1);
@@ -75,7 +75,7 @@ class ModuleShowwhois : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version(1,2,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
        virtual void OnWhois(User* source, User* dest)
@@ -88,13 +88,8 @@ class ModuleShowwhois : public Module
                        }
                        else
                        {
-                               std::deque<std::string> params;
-                               params.push_back(dest->nick);
-                               std::string msg = ":";
-                               msg = msg + dest->server + " NOTICE " + dest->nick + " :*** " + source->nick + " (" + source->ident + "@" + source->host + ") did a /whois on you.";
-                               params.push_back(msg);
-                               Event ev((char *) &params, NULL, "send_push");
-                               ev.Send(ServerInstance);
+                               std::string msg = std::string(":") + dest->server + " NOTICE " + dest->nick + " :*** " + source->nick + " (" + source->ident + "@" + source->host + ") did a /whois on you.";
+                               ServerInstance->PI->PushToClient(dest, msg);
                        }
                }
        }