MetaData rework

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

diff --git a/src/modules/m_blockcaps.cpp b/src/modules/m_blockcaps.cpp
index 0b1cc22616458aab2746dbe7601bd4946b9d9483..8b0c73ce3707f243524d9d45ba25da2969ab746e 100644 (file)
--- a/src/modules/m_blockcaps.cpp
+++ b/src/modules/m_blockcaps.cpp
@@ -26,21 +26,17 @@ class BlockCaps : public SimpleChannelModeHandler
 
 class ModuleBlockCAPS : public Module
 {
-       BlockCaps* bc;
+       BlockCaps bc;
        int percent;
        unsigned int minlen;
        char capsmap[256];
 public:
 
-       ModuleBlockCAPS(InspIRCd* Me) : Module(Me)
+       ModuleBlockCAPS(InspIRCd* Me) : Module(Me), bc(Me)
        {
-               OnRehash(NULL,"");
-               bc = new BlockCaps(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(bc))
-               {
-                       delete bc;
+               OnRehash(NULL);
+               if (!ServerInstance->Modes->AddMode(&bc))
                        throw ModuleException("Could not add new modes!");
-               }
                Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 4);
        }
@@ -50,7 +46,7 @@ public:
                ServerInstance->AddExtBanChar('B');
        }
 
-       virtual void OnRehash(User* user, const std::string &param)
+       virtual void OnRehash(User* user)
        {
                ReadConf();
        }
@@ -90,7 +86,7 @@ public:
                                }
                                if ( ((caps*100)/(int)text.length()) >= percent )
                                {
-                                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Your line cannot be more than %d%% capital letters if it is %d or more letters long", user->nick.c_str(), c->name.c_str(), percent, minlen);
+                                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Your message cannot contain more than %d%% capital letters if it's longer than %d characters", user->nick.c_str(), c->name.c_str(), percent, minlen);
                                        return 1;
                                }
                        }
@@ -128,8 +124,7 @@ public:
 
        virtual ~ModuleBlockCAPS()
        {
-               ServerInstance->Modes->DelMode(bc);
-               delete bc;
+               ServerInstance->Modes->DelMode(&bc);
        }
 
        virtual Version GetVersion()