Replace nick_is_* checking of static userlevels with NickCore::IsServicesOper, which just confirms they have *an* opertype.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2231 5417fbe8-f217-4b02-8779-1006273d7864

2 files changed, 5 insertions, 3 deletions

diff --git a/include/account.h b/include/account.h
index 43e82fb8e..f8fd71b3c 100644
--- a/include/account.h
+++ b/include/account.h
@@ -71,6 +71,11 @@ class CoreExport NickCore : public Extensible
 	  */
 	bool HasCommand(const std::string &cmdstr) const;
 
+	/** Checks whether this account is a services oper or not.
+	 * @return True if this account is a services oper, false otherwise.
+	 */
+	bool IsServicesOper() const;
+
 	/** Check whether this opertype has access to the given special permission.
 	  * @param privstr The priv to check for, e.g. users/auspex.
 	  * @return True if this opertype has the specified priv, false otherwise.
diff --git a/include/extern.h b/include/extern.h
index e16665714..c65bba1e2 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -755,9 +755,6 @@ E void os_remove_nick(NickCore *nc);
 E int is_services_root(User *u);
 E int is_services_admin(User *u);
 E int is_services_oper(User *u);
-E int nick_is_services_root(NickCore * nc);
-E int nick_is_services_admin(NickCore *nc);
-E int nick_is_services_oper(NickCore *nc);
 
 E int add_akill(User *u, const char *mask, const char *by, const time_t expires, const char *reason);
 E int check_akill(const char *nick, const char *username, const char *host, const char *vhost, const char *ip);