Rename UserChanList to User::ChanList, remove UCListIter

12 files changed, 16 insertions, 21 deletions

diff --git a/include/typedefs.h b/include/typedefs.h
index 640c70cab..bd236dc62 100644
--- a/include/typedefs.h
+++ b/include/typedefs.h
@@ -65,14 +65,6 @@ typedef std::vector<std::pair<std::string, std::string> > FailedPortList;
  */
 typedef std::vector<reference<ConnectClass> > ClassVector;
 
-/** Typedef for the list of user-channel records for a user
- */
-typedef intrusive_list<Membership> UserChanList;
-
-/** Shorthand for an iterator into a UserChanList
- */
-typedef UserChanList::iterator UCListIter;
-
 /** List of channels to consider when building the neighbor list of a user
  */
 typedef std::vector<Membership*> IncludeChanList;
diff --git a/include/users.h b/include/users.h
index 6408bc45f..8c89a0b16 100644
--- 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 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.
 	 */
diff --git a/src/coremods/core_user/cmd_nick.cpp b/src/coremods/core_user/cmd_nick.cpp
index 1d14ca703..a62e1c207 100644
--- a/src/coremods/core_user/cmd_nick.cpp
+++ b/src/coremods/core_user/cmd_nick.cpp
@@ -72,7 +72,7 @@ CmdResult CommandNick::HandleLocal(const std::vector<std::string>& parameters, L
 	// one of the channels they are on
 	if (ServerInstance->Config->RestrictBannedUsers)
 	{
-		for (UCListIter i = user->chans.begin(); i != user->chans.end(); ++i)
+		for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); ++i)
 		{
 			Channel* chan = (*i)->chan;
 			if (chan->GetPrefixValue(user) < VOICE_VALUE && chan->IsBanned(user))
diff --git a/src/coremods/core_who.cpp b/src/coremods/core_who.cpp
index ba67d0700..18a63ff3c 100644
--- a/src/coremods/core_who.cpp
+++ b/src/coremods/core_who.cpp
@@ -42,7 +42,7 @@ class CommandWho : public Command
 
 	Membership* get_first_visible_channel(User* u)
 	{
-		for (UCListIter i = u->chans.begin(); i != u->chans.end(); ++i)
+		for (User::ChanList::iterator i = u->chans.begin(); i != u->chans.end(); ++i)
 		{
 			Membership* memb = *i;
 			if (!memb->chan->IsModeSet(secretmode))
diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp
index 934dd2102..8fce7d339 100644
--- a/src/coremods/core_whois.cpp
+++ b/src/coremods/core_whois.cpp
@@ -59,7 +59,7 @@ std::string CommandWhois::ChannelList(User* source, User* dest, bool spy)
 {
 	std::string list;
 
-	for (UCListIter i = dest->chans.begin(); i != dest->chans.end(); i++)
+	for (User::ChanList::iterator i = dest->chans.begin(); i != dest->chans.end(); i++)
 	{
 		Membership* memb = *i;
 		Channel* c = memb->chan;
diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp
index 300caa123..4d3f80e36 100644
--- a/src/modules/m_channelban.cpp
+++ b/src/modules/m_channelban.cpp
@@ -40,7 +40,7 @@ class ModuleBadChannelExtban : public Module
 				rm = mask.substr(3);
 				status = mh->GetModeChar();
 			}
-			for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+			for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); i++)
 			{
 				if (InspIRCd::Match((*i)->chan->name, rm))
 				{
diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 75c6a4399..cbdb1d528 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -190,7 +190,7 @@ class CommandCheck : public Command
 			else
 				user->SendText(checkstr + " onip " + targuser->GetIPString());
 
-			for (UCListIter i = targuser->chans.begin(); i != targuser->chans.end(); i++)
+			for (User::ChanList::iterator i = targuser->chans.begin(); i != targuser->chans.end(); i++)
 			{
 				Membership* memb = *i;
 				Channel* c = memb->chan;
diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index cd1bddce4..cade0b1db 100644
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -128,7 +128,7 @@ class ModuleNickFlood : public Module
 
 	ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE
 	{
-		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+		for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); i++)
 		{
 			Channel* channel = (*i)->chan;
 			ModResult res;
@@ -167,7 +167,7 @@ class ModuleNickFlood : public Module
 		if (isdigit(user->nick[0])) /* allow switches to UID */
 			return;
 
-		for (UCListIter i = user->chans.begin(); i != user->chans.end(); ++i)
+		for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); ++i)
 		{
 			Channel* channel = (*i)->chan;
 			ModResult res;
diff --git a/src/modules/m_nonicks.cpp b/src/modules/m_nonicks.cpp
index 5a45bbb4a..63815f2bf 100644
--- a/src/modules/m_nonicks.cpp
+++ b/src/modules/m_nonicks.cpp
@@ -48,7 +48,7 @@ class ModuleNoNickChange : public Module
 
 	ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE
 	{
-		for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
+		for (User::ChanList::iterator i = user->chans.begin(); i != user->chans.end(); i++)
 		{
 			Channel* curr = (*i)->chan;
 
diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp
index 3bf4c8434..3f05dd086 100644
--- a/src/modules/m_operprefix.cpp
+++ b/src/modules/m_operprefix.cpp
@@ -79,7 +79,7 @@ class ModuleOperPrefixMode : public Module
 		modechange.push_back(add ? "+" : "-");
 		modechange[1].push_back(opm.GetModeChar());
 		modechange.push_back(user->nick);
-		for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
+		for (User::ChanList::iterator v = user->chans.begin(); v != user->chans.end(); v++)
 		{
 			modechange[0] = (*v)->chan->name;
 			ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient);
diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index e10781198..3393539cc 100644
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -72,7 +72,7 @@ namespace
 		for (LocalUserList::iterator i = list.begin(); i != list.end(); ++i)
 		{
 			LocalUser* user = *i;
-			for (UCListIter j = user->chans.begin(); j != user->chans.end(); ++j)
+			for (User::ChanList::iterator j = user->chans.begin(); j != user->chans.end(); ++j)
 				(*j)->id = 0;
 		}
 	}
diff --git a/src/users.cpp b/src/users.cpp
index 8dbacde64..c2b8852d8 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -997,7 +997,7 @@ void User::SendText(const std::string& linePrefix, std::stringstream& textStream
 bool User::SharesChannelWith(User *other)
 {
 	/* Outer loop */
-	for (UCListIter i = this->chans.begin(); i != this->chans.end(); i++)
+	for (User::ChanList::iterator i = this->chans.begin(); i != this->chans.end(); ++i)
 	{
 		/* Eliminate the inner loop (which used to be ~equal in size to the outer loop)
 		 * by replacing it with a map::find which *should* be more efficient
@@ -1170,7 +1170,7 @@ void LocalUser::SetClass(const std::string &explicit_name)
 void User::PurgeEmptyChannels()
 {
 	// firstly decrement the count on each channel
-	for (UCListIter i = this->chans.begin(); i != this->chans.end(); )
+	for (User::ChanList::iterator i = this->chans.begin(); i != this->chans.end(); )
 	{
 		Channel* c = (*i)->chan;
 		++i;