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 050707e73e38b73337f5534c51f345808bb7f8f2..336084c556657aaf4715fe9400325cf91953f432 100644 (file)
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -31,7 +31,6 @@ class Extensible;
 class FakeUser;
 class InspIRCd;
 class Invitation;
-class InviteBase;
 class LocalUser;
 class Membership;
 class Module;
@@ -57,15 +56,11 @@ 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;
@@ -82,10 +77,6 @@ typedef UserChanList::iterator UCListIter;
  */
 typedef std::vector<Membership*> IncludeChanList;
 
-/** A list of custom modes parameters on a channel
- */
-typedef std::map<char,std::string> CustomModeList;
-
 /** A cached text file stored with its contents as lines
  */
 typedef std::vector<std::string> file_cache;