diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/channels.h | 8 | ||||
| -rw-r--r-- | include/typedefs.h | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/include/channels.h b/include/channels.h index 95c516a05..eeb2501fa 100644 --- a/include/channels.h +++ b/include/channels.h @@ -57,9 +57,9 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel> * This function does not remove the channel from User::chanlist. * Since the parameter is an iterator to the target, the complexity * of this function is constant. - * @param membiter The UserMembIter to remove, must be valid + * @param membiter The MemberMap iterator to remove, must be valid */ - void DelUser(const UserMembIter& membiter); + void DelUser(const MemberMap::iterator& membiter); public: /** Creates a channel record and initialises it with default values @@ -187,7 +187,7 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel> * @param victimiter Iterator to the user being kicked, must be valid * @param reason The reason for the kick */ - void KickUser(User* src, const UserMembIter& victimiter, const std::string& reason); + void KickUser(User* src, const MemberMap::iterator& victimiter, const std::string& reason); /** Make src kick user from this channel with the given reason. * @param src The source of the kick @@ -196,7 +196,7 @@ class CoreExport Channel : public Extensible, public InviteBase<Channel> */ void KickUser(User* src, User* user, const std::string& reason) { - UserMembIter it = userlist.find(user); + MemberMap::iterator it = userlist.find(user); if (it != userlist.end()) KickUser(src, it, reason); } diff --git a/include/typedefs.h b/include/typedefs.h index a99f44fa2..640c70cab 100644 --- a/include/typedefs.h +++ b/include/typedefs.h @@ -100,11 +100,6 @@ typedef std::map<std::string, reference<OperInfo> > OperIndex; /** Files read by the configuration */ typedef std::map<std::string, file_cache> ConfigFileCache; -/** Membership list of a channel */ -typedef std::map<User*, Membership*> UserMembList; -/** Iterator of UserMembList */ -typedef UserMembList::iterator UserMembIter; - /** Generic user list, used for exceptions */ typedef std::set<User*> CUList; |