X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ircv3.cpp;h=4eb54d2a6f7af6413999b3968868ff23740a6d0a;hb=3ccf0065d43db80f31c6404aeac4d65551481508;hp=5cb2ab6b131bc6f3f51e6ccb02a8311406848f58;hpb=932e8d13f81c7c94a89dc3702f6d45bc185f5dcf;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp
index 5cb2ab6b1..4eb54d2a6 100644
--- a/src/modules/m_ircv3.cpp
+++ b/src/modules/m_ircv3.cpp
@@ -50,8 +50,8 @@ class ModuleIRCv3 : public Module
 		std::set<User*> already_sent;
 		for (IncludeChanList::const_iterator i = chans.begin(); i != chans.end(); ++i)
 		{
-			const UserMembList* userlist = (*i)->chan->GetUsers();
-			for (UserMembList::const_iterator m = userlist->begin(); m != userlist->end(); ++m)
+			const Channel::MemberMap& userlist = (*i)->chan->GetUsers();
+			for (Channel::MemberMap::const_iterator m = userlist.begin(); m != userlist.end(); ++m)
 			{
 				/*
 				 * Send the line if the channel member in question meets all of the following criteria:
@@ -134,8 +134,8 @@ class ModuleIRCv3 : public Module
 		std::string line;
 		std::string mode;
 
-		const UserMembList* userlist = memb->chan->GetUsers();
-		for (UserMembCIter it = userlist->begin(); it != userlist->end(); ++it)
+		const Channel::MemberMap& userlist = memb->chan->GetUsers();
+		for (Channel::MemberMap::const_iterator it = userlist.begin(); it != userlist.end(); ++it)
 		{
 			// Send the extended join line if the current member is local, has the extended-join cap and isn't excepted
 			User* member = IS_LOCAL(it->first);
@@ -208,8 +208,8 @@ class ModuleIRCv3 : public Module
 
 		std::string line = ":" + memb->user->GetFullHost() + " AWAY :" + memb->user->awaymsg;
 
-		const UserMembList* userlist = memb->chan->GetUsers();
-		for (UserMembCIter it = userlist->begin(); it != userlist->end(); ++it)
+		const Channel::MemberMap& userlist = memb->chan->GetUsers();
+		for (Channel::MemberMap::const_iterator it = userlist.begin(); it != userlist.end(); ++it)
 		{
 			// Send the away notify line if the current member is local, has the away-notify cap and isn't excepted
 			User* member = IS_LOCAL(it->first);