m_spanningtree Rewrite PING logic to use Timers

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

diff --git a/include/users.h b/include/users.h
index 4029daa5346bccd899d44853a5c44cc6f9971fd7..ceee4396bece7ef01ffe2479dfc139a5a73ebe06 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -248,6 +248,9 @@ class CoreExport User : public Extensible
        std::bitset<ModeParser::MODEID_MAX> modes;
 
  public:
+       /** List of Memberships for this user
+        */
+       typedef insp::intrusive_list<Membership> ChanList;
 
        /** Hostname of connection.
         * This should be valid as per RFC1035.
@@ -302,7 +305,7 @@ class CoreExport User : public Extensible
 
        /** Channels this user is on
         */
-       UserChanList chans;
+       ChanList chans;
 
        /** The server the user is connected to.
         */
@@ -588,7 +591,7 @@ class CoreExport User : public Extensible
        bool ChangeName(const std::string& gecos);
 
        /** Change a user's nick
-        * @param newnick The new nick
+        * @param newnick The new nick. If equal to the users uuid, the nick change always succeeds.
         * @return True if the change succeeded
         */
        bool ChangeNick(const std::string& newnick, time_t newts = 0);
@@ -622,7 +625,7 @@ class CoreExport UserIOHandler : public StreamSocket
 
 typedef unsigned int already_sent_t;
 
-class CoreExport LocalUser : public User, public InviteBase<LocalUser>, public intrusive_list_node<LocalUser>
+class CoreExport LocalUser : public User, public InviteBase<LocalUser>, public insp::intrusive_list_node<LocalUser>
 {
  public:
        LocalUser(int fd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server);