Merge pull request #543 from SaberUK/master+sizeparam-removal

[user/henk/code/inspircd.git] / src / commands / cmd_whois.cpp

diff --git a/src/commands/cmd_whois.cpp b/src/commands/cmd_whois.cpp
index 072e047695f5ba72d9422d4c678703df1c6702ba..fea14f375bb1c12efe85a803ac9cf6117e3e14dc 100644 (file)
--- a/src/commands/cmd_whois.cpp
+++ b/src/commands/cmd_whois.cpp
@@ -135,17 +135,17 @@ void CommandWhois::DoWhois(User* user, User* dest, unsigned long signon, unsigne
                ServerInstance->SendWhoisLine(user, dest, 312, "%s %s %s :%s",user->nick.c_str(), dest->nick.c_str(), dest->server.c_str(), serverdesc.c_str());
        }
 
-       if (IS_AWAY(dest))
+       if (dest->IsAway())
        {
                ServerInstance->SendWhoisLine(user, dest, 301, "%s %s :%s",user->nick.c_str(), dest->nick.c_str(), dest->awaymsg.c_str());
        }
 
-       if (IS_OPER(dest))
+       if (dest->IsOper())
        {
                if (ServerInstance->Config->GenericOper)
                        ServerInstance->SendWhoisLine(user, dest, 313, "%s %s :is an IRC operator",user->nick.c_str(), dest->nick.c_str());
                else
-                       ServerInstance->SendWhoisLine(user, dest, 313, "%s %s :is %s %s on %s",user->nick.c_str(), dest->nick.c_str(), (strchr("AEIOUaeiou",dest->oper->name[0]) ? "an" : "a"),dest->oper->NameStr(), ServerInstance->Config->Network.c_str());
+                       ServerInstance->SendWhoisLine(user, dest, 313, "%s %s :is %s %s on %s",user->nick.c_str(), dest->nick.c_str(), (strchr("AEIOUaeiou",dest->oper->name[0]) ? "an" : "a"),dest->oper->name.c_str(), ServerInstance->Config->Network.c_str());
        }
 
        if (user == dest || user->HasPrivPermission("users/auspex"))