Create the core_xline module

[user/henk/code/inspircd.git] / include / usermanager.h

diff --git a/include/usermanager.h b/include/usermanager.h
index c6745ace626d12f2347c6caeccbe881e3b351884..e287d74d0be434f3799969292dac53612751a5a2 100644 (file)
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -63,10 +63,6 @@ class CoreExport UserManager
         */
        unsigned int unregistered_count;
 
-       /** Number of elements in local_users
-        */
-       unsigned int local_count;
-
        /** Map of global ip addresses for clone counting
         * XXX - this should be private, but m_clones depends on it currently.
         */
@@ -102,10 +98,10 @@ class CoreExport UserManager
        /** Disconnect a user gracefully
         * @param user The user to remove
         * @param quitreason The quit reason to show to normal users
-        * @param operreason The quit reason to show to opers
+        * @param operreason The quit reason to show to opers, can be NULL if same as quitreason
         * @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 = "");
+       void QuitUser(User* user, const std::string& quitreason, const std::string* operreason = NULL);
 
        /** Add a user to the local clone map
         * @param user The user to add
@@ -159,7 +155,7 @@ class CoreExport UserManager
        /** Return a count of local registered users
         * @return The number of registered local users
         */
-       unsigned int LocalUserCount() const { return (this->local_count - this->UnregisteredUserCount()); }
+       unsigned int LocalUserCount() const { return (this->local_users.size() - this->UnregisteredUserCount()); }
 
        /** Send a server notice to all local users
         * @param text The text format string to send