Fix these to use new hook system (u_listmode wasnt fixed yet)

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

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 09d9d94afc2a1a18a769547c69fae81abe83b28f..5125fbf54a68b072e398278090f088009de24368 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -17,20 +17,20 @@
 
 /** Handle /SWHOIS
  */
-class cmd_swhois : public command_t
+class CommandSwhois : public Command
 {
        
  public:
-       cmd_swhois (InspIRCd* Instance) : command_t(Instance,"SWHOIS",'o',2)
+       CommandSwhois (InspIRCd* Instance) : Command(Instance,"SWHOIS",'o',2)
        {
                this->source = "m_swhois.so";
                syntax = "<nick> <swhois>";
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
-       CmdResult Handle(const char** parameters, int pcnt, userrec* user)
+       CmdResult Handle(const char** parameters, int pcnt, User* user)
        {
-               userrec* dest = ServerInstance->FindNick(parameters[0]);
+               User* dest = ServerInstance->FindNick(parameters[0]);
                
                if (!dest)
                {
@@ -65,7 +65,7 @@ class cmd_swhois : public command_t
                                ServerInstance->WriteOpers("*** %s used SWHOIS to set %s's extra whois from '%s' to '%s'", user->nick, dest->nick, text->c_str(), line.c_str());
                        
                        dest->Shrink("swhois");
-                       DELETE(text);
+                       delete text;
                }
                else if (!ServerInstance->ULine(user->server))
                {
@@ -97,7 +97,7 @@ class cmd_swhois : public command_t
 
 class ModuleSWhois : public Module
 {
-       cmd_swhois* mycommand;
+       CommandSwhois* mycommand;
        
        ConfigReader* Conf;
        
@@ -106,13 +106,15 @@ class ModuleSWhois : public Module
        {
                
                Conf = new ConfigReader(ServerInstance);
-               mycommand = new cmd_swhois(ServerInstance);
+               mycommand = new CommandSwhois(ServerInstance);
                ServerInstance->AddCommand(mycommand);
+               Implementation eventlist[] = { I_OnDecodeMetaData, I_OnWhoisLine, I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnRehash, I_OnPostCommand };
+               ServerInstance->Modules->Attach(eventlist, this, 7);
        }
 
-       void OnRehash(userrec* user, const std::string &parameter)
+       void OnRehash(User* user, const std::string &parameter)
        {
-               DELETE(Conf);
+               delete Conf;
                Conf = new ConfigReader(ServerInstance);
        }
 
@@ -122,7 +124,7 @@ class ModuleSWhois : public Module
        }
 
        // :kenny.chatspike.net 320 Brain Azhrarn :is getting paid to play games.
-       int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text)
+       int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text)
        {
                /* We use this and not OnWhois because this triggers for remote, too */
                if (numeric == 312)
@@ -140,11 +142,11 @@ class ModuleSWhois : public Module
        }
 
        // Whenever the linking module wants to send out data, but doesnt know what the data
-       // represents (e.g. it is metadata, added to a userrec or chanrec by a module) then
+       // represents (e.g. it is metadata, added to a User or Channel by a module) then
        // this method is called. We should use the ProtoSendMetaData function after we've
        // corrected decided how the data should look, to send the metadata on its way if
        // it is ours.
-       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+       virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
        {
                // check if the linking module wants to know about OUR metadata
                if (extname == "swhois")
@@ -162,14 +164,14 @@ class ModuleSWhois : public Module
        }
 
        // when a user quits, tidy up their metadata
-       virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)
+       virtual void OnUserQuit(User* user, const std::string &message, const std::string &oper_message)
        {
                std::string* swhois;
                user->GetExt("swhois", swhois);
                if (swhois)
                {
                        user->Shrink("swhois");
-                       DELETE(swhois);
+                       delete swhois;
                }
        }
 
@@ -178,13 +180,13 @@ class ModuleSWhois : public Module
        {
                if (target_type == TYPE_USER)
                {
-                       userrec* user = (userrec*)item;
+                       User* user = (User*)item;
                        std::string* swhois;
                        user->GetExt("swhois", swhois);
                        if (swhois)
                        {
                                user->Shrink("swhois");
-                               DELETE(swhois);
+                               delete swhois;
                        }
                }
        }
@@ -201,7 +203,7 @@ class ModuleSWhois : public Module
                // check if its our metadata key, and its associated with a user
                if ((target_type == TYPE_USER) && (extname == "swhois"))
                {
-                       userrec* dest = (userrec*)target;
+                       User* dest = (User*)target;
                        // if they dont already have an swhois field, accept the remote server's
                        std::string* text;
                        if (!dest->GetExt("swhois", text))
@@ -212,7 +214,7 @@ class ModuleSWhois : public Module
                }
        }
        
-       virtual void OnPostCommand(const std::string &command, const char **params, int pcnt, userrec *user, CmdResult result, const std::string &original_line)
+       virtual void OnPostCommand(const std::string &command, const char **params, int pcnt, User *user, CmdResult result, const std::string &original_line)
        {
                if ((command != "OPER") || (result != CMD_SUCCESS))
                        return;
@@ -248,7 +250,7 @@ class ModuleSWhois : public Module
                if (user->GetExt("swhois", old))
                {
                        user->Shrink("swhois");
-                       DELETE(old);
+                       delete old;
                }
                
                if (!swhois.length())
@@ -267,7 +269,7 @@ class ModuleSWhois : public Module
 
        virtual ~ModuleSWhois()
        {
-               DELETE(Conf);
+               delete Conf;
        }
        
        virtual Version GetVersion()