Change Channel::KickUser() to accept an iterator, add overload that accepts a User

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

diff --git a/include/typedefs.h b/include/typedefs.h
index 37e6daaf0b27aef3a35a2cb77ad51127eeec7614..336084c556657aaf4715fe9400325cf91953f432 100644 (file)
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -31,13 +31,13 @@ class Extensible;
 class FakeUser;
 class InspIRCd;
 class Invitation;
-class InviteBase;
 class LocalUser;
 class Membership;
 class Module;
 class OperInfo;
 class ProtocolServer;
 class RemoteUser;
+class Server;
 class ServerConfig;
 class ServerLimits;
 class Thread;
@@ -56,30 +56,26 @@ typedef TR1NS::unordered_map<std::string, Channel*, irc::insensitive, irc::StrHa
 
 /** A list holding local users, this is the type of UserManager::local_users
  */
-typedef std::list<LocalUser*> LocalUserList;
+typedef intrusive_list<LocalUser> LocalUserList;
 
 /** A list of failed port bindings, used for informational purposes on startup */
 typedef std::vector<std::pair<std::string, std::string> > FailedPortList;
 
-/** Holds a complete list of all channels to which a user has been invited and has not yet joined, and the time at which they'll expire.
- */
-typedef std::vector<Invitation*> InviteList;
-
 /** Holds a complete list of all allow and deny tags from the configuration file (connection classes)
  */
 typedef std::vector<reference<ConnectClass> > ClassVector;
 
 /** Typedef for the list of user-channel records for a user
  */
-typedef std::set<Channel*> UserChanList;
+typedef intrusive_list<Membership> UserChanList;
 
 /** Shorthand for an iterator into a UserChanList
  */
 typedef UserChanList::iterator UCListIter;
 
-/** A list of custom modes parameters on a channel
+/** List of channels to consider when building the neighbor list of a user
  */
-typedef std::map<char,std::string> CustomModeList;
+typedef std::vector<Membership*> IncludeChanList;
 
 /** A cached text file stored with its contents as lines
  */