Move QuitUser into UserManager class, and unstaticize it. This prepares for some benchmarking lulz on object pooling I plan to do today, as well as making more sense now we *have* a manager class

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

2 files changed, 8 insertions, 8 deletions

diff --git a/include/usermanager.h b/include/usermanager.h
index 552fb4136..8b6d3e9bd 100644
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -73,6 +73,14 @@ class CoreExport UserManager : public classbase
 	 */
 	void AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip);
 
+	/** Disconnect a user gracefully
+ 	 * @param user The user to remove
+ 	 * @param r The quit reason to show to normal users
+ 	 * @param oreason The quit reason to show to opers
+ 	 * @return Although this function has no return type, on exit the user provided will no longer exist.
+	 */
+	void QuitUser(User *user, const std::string &quitreason, const char* operreason = "");
+
 	/** Add a user to the local clone map
 	 * @param user The user to add
 	 */
diff --git a/include/users.h b/include/users.h
index 0fa51268d..c563431d2 100644
--- a/include/users.h
+++ b/include/users.h
@@ -878,14 +878,6 @@ class CoreExport User : public connection
 	 */
 	void CloseSocket();
 
-	/** Disconnect a user gracefully
-	 * @param user The user to remove
-	 * @param r The quit reason to show to normal users
-	 * @param oreason The quit reason to show to opers
-	 * @return Although this function has no return type, on exit the user provided will no longer exist.
-	 */
-	static void QuitUser(InspIRCd* Instance, User *user, const std::string &r, const char* oreason = "");
-
 	/** Add the user to WHOWAS system
 	 */
 	void AddToWhoWas();