More AddModes fixes

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

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index cbb7138d7def6f45fdcbf336221cd28964fe24ae..8be08db6275cd326298291e2e8f80a63157c7bfb 100644 (file)
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -69,12 +69,12 @@ class RemoveBase
                }
        }
        
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user, bool neworder)
+       CmdResult Handle (const char** parameters, int pcnt, User *user, bool neworder)
        {
                const char* channame;
                const char* username;
-               userrec* target;
-               chanrec* channel;
+               User* target;
+               Channel* channel;
                ModeLevel tlevel;
                ModeLevel ulevel;
                std::string reason;
@@ -149,7 +149,7 @@ class RemoveBase
                        tlevel = chartolevel(channel->GetPrefixChar(target));
                }
                
-               hasnokicks = (ServerInstance->FindModule("m_nokicks.so") && channel->IsModeSet('Q'));
+               hasnokicks = (ServerInstance->Modules->Find("m_nokicks.so") && channel->IsModeSet('Q'));
                
                /* We support the +Q channel mode via. the m_nokicks module, if the module is loaded and the mode is set then disallow the /remove */
                if ((!IS_LOCAL(user)) || (!supportnokicks || !hasnokicks || (ulevel == ULINE)))
@@ -203,20 +203,17 @@ class RemoveBase
 
 /** Handle /REMOVE
  */
-class cmd_remove : public command_t, public RemoveBase
+class CommandRemove : public Command, public RemoveBase
 {
  public:
-       cmd_remove(InspIRCd* Instance, bool& snk) : command_t(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk)
+       CommandRemove(InspIRCd* Instance, bool& snk) : Command(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk)
        {
                this->source = "m_remove.so";
                syntax = "<nick> <channel> [<reason>]";
                TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
-
-               for (size_t x = 0; x < translation.size(); x++)
-                       printf("translation[%ld] = %ld\n", x, translation[x]);
        }
        
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
                return RemoveBase::Handle(parameters, pcnt, user, false);
        }
@@ -224,16 +221,16 @@ class cmd_remove : public command_t, public RemoveBase
 
 /** Handle /FPART
  */
-class cmd_fpart : public command_t, public RemoveBase
+class CommandFpart : public Command, public RemoveBase
 {
  public:
-       cmd_fpart(InspIRCd* Instance, bool& snk) : command_t(Instance, "FPART", 0, 2), RemoveBase(Instance, snk)
+       CommandFpart(InspIRCd* Instance, bool& snk) : Command(Instance, "FPART", 0, 2), RemoveBase(Instance, snk)
        {
                this->source = "m_remove.so";
                syntax = "<channel> <nick> [<reason>]";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, User *user)
        {
                return RemoveBase::Handle(parameters, pcnt, user, true);
        }
@@ -241,8 +238,8 @@ class cmd_fpart : public command_t, public RemoveBase
 
 class ModuleRemove : public Module
 {
-       cmd_remove* mycommand;
-       cmd_fpart* mycommand2;
+       CommandRemove* mycommand;
+       CommandFpart* mycommand2;
        bool supportnokicks;
        
        
@@ -250,8 +247,8 @@ class ModuleRemove : public Module
        ModuleRemove(InspIRCd* Me)
        : Module(Me)
        {
-               mycommand = new cmd_remove(ServerInstance, supportnokicks);
-               mycommand2 = new cmd_fpart(ServerInstance, supportnokicks);
+               mycommand = new CommandRemove(ServerInstance, supportnokicks);
+               mycommand2 = new CommandFpart(ServerInstance, supportnokicks);
                ServerInstance->AddCommand(mycommand);
                ServerInstance->AddCommand(mycommand2);
                OnRehash(NULL,"");
@@ -267,7 +264,7 @@ class ModuleRemove : public Module
                output.append(" REMOVE");
        }
        
-       virtual void OnRehash(userrec* user, const std::string&)
+       virtual void OnRehash(User* user, const std::string&)
        {
                ConfigReader conf(ServerInstance);
                supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0);