Change to using Instance->Log (InspIRCd::Log) rather than log() macro

[user/henk/code/inspircd.git] / src / modes / cmode_o.cpp

diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp
index 580fcc636ede72ca089541037b7225c9c796ae5b..6aa36cc79228990c1e3fc587290c74c1ec811369 100644 (file)
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -8,21 +8,13 @@
 #include "channels.h"
 #include "users.h"
 #include "helperfuncs.h"
-#include "message.h"
 #include "commands.h"
 #include "modules.h"
 #include "inspstring.h"
 #include "hashcomp.h"
 #include "modes/cmode_o.h"
 
-extern InspIRCd* ServerInstance;
-
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern int MODCOUNT;
-extern time_t TIME;
-
-ModeChannelOp::ModeChannelOp() : ModeHandler('o', 1, 1, true, MODETYPE_CHANNEL, false)
+ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, 'o', 1, 1, true, MODETYPE_CHANNEL, false)
 {
 }
 
@@ -31,7 +23,7 @@ ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel
        userrec* x = ServerInstance->FindNick(parameter);
        if (x)
        {
-               if (cstatus(x, channel) == STATUS_OP)
+               if (channel->GetStatus(x) == STATUS_OP)
                {
                        return std::make_pair(true, x->nick);
                }
@@ -45,7 +37,7 @@ ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel
 
 ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 {
-       int status = cstatus(source, channel);
+       int status = channel->GetStatus(source);
 
        /* Call the correct method depending on wether we're adding or removing the mode */
        if (adding)
@@ -66,7 +58,7 @@ ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec*
 
 std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,int status)
 {
-       userrec *d = ModeParser::SanityChecks(user,dest,chan,status);
+       userrec *d = ServerInstance->ModeGrok->SanityChecks(user,dest,chan,status);
 
        if (d)
        {
@@ -87,24 +79,24 @@ std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,in
                        }
                }
 
-               return ModeParser::Grant(d,chan,UCMODE_OP);
+               return ServerInstance->ModeGrok->Grant(d,chan,UCMODE_OP);
        }
        return "";
 }
 
 std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,int status)
 {
-       userrec *d = ModeParser::SanityChecks(user,dest,chan,status);
+       userrec *d = ServerInstance->ModeGrok->SanityChecks(user,dest,chan,status);
 
        if (d)
        {
                if (IS_LOCAL(user))
                {
                        int MOD_RESULT = 0;
-                       log(DEBUG,"Call OnAccessCheck for AC_DEOP");
+                       ServerInstance->Log(DEBUG,"Call OnAccessCheck for AC_DEOP");
                        FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
 
-                       log(DEBUG,"Returns %d",MOD_RESULT);
+                       ServerInstance->Log(DEBUG,"Returns %d",MOD_RESULT);
 
                        if (MOD_RESULT == ACR_DENY)
                                return "";
@@ -118,7 +110,7 @@ std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,in
                        }
                }
 
-               return ModeParser::Revoke(d,chan,UCMODE_OP);
+               return ServerInstance->ModeGrok->Revoke(d,chan,UCMODE_OP);
        }
        return "";
 }