Apply CAP ACK/NAK stuff from nenolod, thanks :)

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

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index 55cbd2830dd86f8c8b6ea68328c67201a867c567..78708a5e83e7b5e3344c2678c8568284202f8e34 100644 (file)
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -25,7 +25,7 @@ class User_d : public ModeHandler
  public:
        User_d(InspIRCd* Instance) : ModeHandler(Instance, 'd', 0, 0, false, MODETYPE_USER, false) { }
 
-       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)
        {
                if (adding)
                {
@@ -60,7 +60,7 @@ class ModuleDeaf : public Module
                : Module(Me)
        {
                m1 = new User_d(ServerInstance);
-               if (!ServerInstance->AddMode(m1))
+               if (!ServerInstance->Modes->AddMode(m1))
                        throw ModuleException("Could not add new modes!");
 
                OnRehash(NULL, "");
@@ -68,10 +68,6 @@ class ModuleDeaf : public Module
                ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = List[I_OnBuildExemptList] = 1;
-       }
 
        virtual void OnRehash(User* user, const std::string&)
        {
@@ -79,7 +75,7 @@ class ModuleDeaf : public Module
                deaf_bypasschars = conf->ReadValue("deaf", "bypasschars", 0);
                deaf_bypasschars_uline = conf->ReadValue("deaf", "bypasscharsuline", 0);
 
-               DELETE(conf);
+               delete conf;
        }
 
        virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
@@ -122,13 +118,13 @@ class ModuleDeaf : public Module
                if (!deaf_bypasschars.empty())
                {
                        is_bypasschar_avail = 1;
-                       if (deaf_bypasschars.find(text[0], 0) != string::npos)
+                       if (deaf_bypasschars.find(text[0], 0) != std::string::npos)
                                is_bypasschar = 1;
                }
                if (!deaf_bypasschars_uline.empty())
                {
                        is_bypasschar_uline_avail = 1;
-                       if (deaf_bypasschars_uline.find(text[0], 0) != string::npos)
+                       if (deaf_bypasschars_uline.find(text[0], 0) != std::string::npos)
                                is_bypasschar_uline = 1;
                }
 
@@ -180,7 +176,7 @@ class ModuleDeaf : public Module
        virtual ~ModuleDeaf()
        {
                ServerInstance->Modes->DelMode(m1);
-               DELETE(m1);
+               delete m1;
        }
 
        virtual Version GetVersion()