Move a number of methods from class InspIRCd to class UserManager

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8726 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 21 insertions, 26 deletions

diff --git a/include/inspircd.h b/include/inspircd.h
index 320aa83ca..c8acf4240 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -651,36 +651,11 @@ class CoreExport InspIRCd : public classbase
 	 */
 	static void QuickExit(int status);
 
-	/** Return a count of users, unknown and known connections
-	 * @return The number of users
-	 */
-	int UserCount();
-
-	/** Return a count of fully registered connections only
-	 * @return The number of registered users
-	 */
-	int RegisteredUserCount();
-
-	/** Return a count of opered (umode +o) users only
-	 * @return The number of opers
-	 */
-	int OperCount();
-
-	/** Return a count of unregistered (before NICK/USER) users only
-	 * @return The number of unregistered (unknown) connections
-	 */
-	int UnregisteredUserCount();
-
 	/** Return a count of channels on the network
 	 * @return The number of channels
 	 */
 	long ChannelCount();
 
-	/** Return a count of local users on this server only
-	 * @return The number of local users
-	 */
-	long LocalUserCount();
-
 	/** Send an error notice to all local users, opered and unopered
 	 * @param s The error string to send
 	 */
diff --git a/include/usermanager.h b/include/usermanager.h
index 9cc3e0309..f994e9739 100644
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -77,10 +77,30 @@ class CoreExport UserManager : public classbase
 	 */
 	unsigned long LocalCloneCount(User *user);
 
+	/** Return a count of users, unknown and known connections
+	 * @return The number of users
+	 */
+	unsigned int UserCount();
+
+	/** Return a count of fully registered connections only
+	 * @return The number of registered users
+	 */
+	unsigned int RegisteredUserCount();
 
+	/** Return a count of opered (umode +o) users only
+	 * @return The number of opers
+	 */
+	unsigned int OperCount();
 
+	/** Return a count of unregistered (before NICK/USER) users only
+	 * @return The number of unregistered (unknown) connections
+	 */
+	unsigned int UnregisteredUserCount();
 
-	void RemoveCloneCounts();
+	/** Return a count of local users on this server only
+	 * @return The number of local users
+	 */
+	unsigned int LocalUserCount();
 };
 
 #endif