Fixed makefile

[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 c8a969b9ce45cb6faa42d28466eee55d5bd80c70..0ab3d9d958b94fbe8da5d1ac804f59d56e674520 100644 (file)
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -7,7 +7,7 @@
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
-#include "helperfuncs.h"
+
 #include "commands.h"
 #include "modules.h"
 #include "inspstring.h"
@@ -58,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 = ServerInstance->ModeGrok->SanityChecks(user,dest,chan,status);
+       userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
        if (d)
        {
@@ -71,7 +71,7 @@ std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,in
                                return "";
                        if (MOD_RESULT == ACR_DEFAULT)
                        {
-                               if ((status < STATUS_OP) && (!ServerInstance->is_uline(user->server)))
+                               if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)))
                                {
                                        user->WriteServ("482 %s %s :You're not a channel operator",user->nick, chan->name);
                                        return "";
@@ -79,14 +79,14 @@ std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,in
                        }
                }
 
-               return ServerInstance->ModeGrok->Grant(d,chan,UCMODE_OP);
+               return ServerInstance->Modes->Grant(d,chan,UCMODE_OP);
        }
        return "";
 }
 
 std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,int status)
 {
-       userrec *d = ServerInstance->ModeGrok->SanityChecks(user,dest,chan,status);
+       userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
        if (d)
        {
@@ -102,7 +102,7 @@ std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,in
                                return "";
                        if (MOD_RESULT == ACR_DEFAULT)
                        {
-                               if ((status < STATUS_OP) && (!ServerInstance->is_uline(user->server)) && (IS_LOCAL(user)))
+                               if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)) && (IS_LOCAL(user)))
                                {
                                        user->WriteServ("482 %s %s :You are not a channel operator",user->nick, chan->name);
                                        return "";
@@ -110,7 +110,7 @@ std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,in
                        }
                }
 
-               return ServerInstance->ModeGrok->Revoke(d,chan,UCMODE_OP);
+               return ServerInstance->Modes->Revoke(d,chan,UCMODE_OP);
        }
        return "";
 }