Fix m_nationalchars using a copy and paste of my unsafe copy and paste algorithm...

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

diff --git a/include/usermanager.h b/include/usermanager.h
index 3a9e151507b9b79ca2be8e372fe46d599cde8a0f..452be27fe320ec97eafe88b4c606b22e18257da8 100644 (file)
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -19,7 +19,7 @@
 /** A list of ip addresses cross referenced against clone counts */
 typedef std::map<irc::string, unsigned int> clonemap;
 
-class CoreExport UserManager : public classbase
+class CoreExport UserManager : public Extensible
 {
  private:
        InspIRCd *ServerInstance;
@@ -28,9 +28,8 @@ class CoreExport UserManager : public classbase
         */
        clonemap local_clones;
  public:
-       UserManager(InspIRCd *Instance)
+       UserManager(InspIRCd *Instance) : ServerInstance(Instance)
        {
-               ServerInstance = Instance;
        }
        
        ~UserManager()
@@ -79,7 +78,7 @@ class CoreExport UserManager : public classbase
         * @param ip The IP address of the user
         * @return This function has no return value, but a call to AddClient may remove the user.
         */
-       void AddUser(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip);
+       void AddUser(InspIRCd* Instance, int socket, int port, bool iscached, sockaddr* ip, const std::string &targetip);
 
        /** Disconnect a user gracefully
         * @param user The user to remove