7 files changed, 11 insertions, 11 deletions
diff --git a/src/commands/cmd_map.cpp b/src/commands/cmd_map.cpp
index 385a2c752..0698134b5 100644
--- a/src/commands/cmd_map.cpp
+++ b/src/commands/cmd_map.cpp
@@ -43,7 +43,7 @@ CmdResult CommandMap::Handle (const std::vector<std::string>&, User *user)
 	// module to override its behaviour and display something
 	// better.
 
-	if (IS_OPER(user))
+	if (user->IsOper())
 	{
 		user->WriteNumeric(006, "%s :%s [%s]", user->nick.c_str(), ServerInstance->Config->ServerName.c_str(), ServerInstance->Config->GetSID().c_str());
 		user->WriteNumeric(007, "%s :End of /MAP", user->nick.c_str());
diff --git a/src/commands/cmd_privmsg.cpp b/src/commands/cmd_privmsg.cpp
index 09314e8a9..49845162c 100644
--- a/src/commands/cmd_privmsg.cpp
+++ b/src/commands/cmd_privmsg.cpp
@@ -202,7 +202,7 @@ CmdResult CommandPrivmsg::Handle (const std::vector<std::string>& parameters, Us
 			return CMD_FAILURE;
 		}
 
-		if (IS_AWAY(dest))
+		if (dest->IsAway())
 		{
 			/* auto respond with aweh msg */
 			user->WriteNumeric(301, "%s %s :%s", user->nick.c_str(), dest->nick.c_str(), dest->awaymsg.c_str());
diff --git a/src/commands/cmd_stats.cpp b/src/commands/cmd_stats.cpp
index 86512417c..ccf753956 100644
--- a/src/commands/cmd_stats.cpp
+++ b/src/commands/cmd_stats.cpp
@@ -59,7 +59,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 	std::string sn(ServerInstance->Config->ServerName);
 
 	bool isPublic = ServerInstance->Config->UserStats.find(statschar) != std::string::npos;
-	bool isRemoteOper = IS_REMOTE(user) && IS_OPER(user);
+	bool isRemoteOper = IS_REMOTE(user) && (user->IsOper());
 	bool isLocalOperWithPrivs = IS_LOCAL(user) && user->HasPrivPermission("servers/auspex");
 
 	if (!isPublic && !isRemoteOper && !isLocalOperWithPrivs)
diff --git a/src/commands/cmd_userhost.cpp b/src/commands/cmd_userhost.cpp
index 399de0b1a..933cbca04 100644
--- a/src/commands/cmd_userhost.cpp
+++ b/src/commands/cmd_userhost.cpp
@@ -54,12 +54,12 @@ CmdResult CommandUserhost::Handle (const std::vector<std::string>& parameters, U
 		{
 			retbuf = retbuf + u->nick;
 
-			if (IS_OPER(u))
+			if (u->IsOper())
 				retbuf = retbuf + "*";
 
 			retbuf = retbuf + "=";
 
-			if (IS_AWAY(u))
+			if (u->IsAway())
 				retbuf += "-";
 			else
 				retbuf += "+";
diff --git a/src/commands/cmd_version.cpp b/src/commands/cmd_version.cpp
index 7620197fd..24442d9e1 100644
--- a/src/commands/cmd_version.cpp
+++ b/src/commands/cmd_version.cpp
@@ -42,7 +42,7 @@ class CommandVersion : public Command
 
 CmdResult CommandVersion::Handle (const std::vector<std::string>&, User *user)
 {
-	std::string version = ServerInstance->GetVersionString(IS_OPER(user));
+	std::string version = ServerInstance->GetVersionString((user->IsOper()));
 	user->WriteNumeric(RPL_VERSION, "%s :%s", user->nick.c_str(), version.c_str());
 	ServerInstance->Config->Send005(user);
 	return CMD_SUCCESS;
diff --git a/src/commands/cmd_who.cpp b/src/commands/cmd_who.cpp
index a15fde68e..5a5c27dcf 100644
--- a/src/commands/cmd_who.cpp
+++ b/src/commands/cmd_who.cpp
@@ -201,7 +201,7 @@ void CommandWho::SendWhoLine(User* user, const std::vector<std::string>& parms,
 	wholine.append(" " + u->nick + " ");
 
 	/* away? */
-	if (IS_AWAY(u))
+	if (u->IsAway())
 	{
 		wholine.append("G");
 	}
@@ -211,7 +211,7 @@ void CommandWho::SendWhoLine(User* user, const std::vector<std::string>& parms,
 	}
 
 	/* oper? */
-	if (IS_OPER(u))
+	if (u->IsOper())
 	{
 		wholine.push_back('*');
 	}
@@ -342,7 +342,7 @@ CmdResult CommandWho::Handle (const std::vector<std::string>& parameters, User *
 				if (user != i->first)
 				{
 					/* opers only, please */
-					if (opt_viewopersonly && !IS_OPER(i->first))
+					if (opt_viewopersonly && !i->first->IsOper())
 						continue;
 
 					/* If we're not inside the channel, hide +i users */
diff --git a/src/commands/cmd_whois.cpp b/src/commands/cmd_whois.cpp
index 072e04769..b4483d8bb 100644
--- a/src/commands/cmd_whois.cpp
+++ b/src/commands/cmd_whois.cpp
@@ -135,12 +135,12 @@ 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());