Use the same object for chanusercontainer and userchancontainer

2 files changed, 8 insertions, 8 deletions

diff --git a/modules/extra/cs_statusupdate.cpp b/modules/extra/cs_statusupdate.cpp
index 41ea8833e..4f789156e 100644
--- a/modules/extra/cs_statusupdate.cpp
+++ b/modules/extra/cs_statusupdate.cpp
@@ -34,7 +34,7 @@ class StatusUpdate : public Module
 	void OnAccessAdd(ChannelInfo *ci, CommandSource &, ChanAccess *access) anope_override
 	{
 		if (ci->c)
-			for (CUserList::iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; ++it)
+			for (Channel::ChanUserList::iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; ++it)
 			{
 				User *user = (*it)->user;
 
@@ -51,7 +51,7 @@ class StatusUpdate : public Module
 	void OnAccessDel(ChannelInfo *ci, CommandSource &, ChanAccess *access) anope_override
 	{
 		if (ci->c)
-			for (CUserList::iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; ++it)
+			for (Channel::ChanUserList::iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; ++it)
 			{
 				User *user = (*it)->user;
 
diff --git a/modules/extra/m_xmlrpc_main.cpp b/modules/extra/m_xmlrpc_main.cpp
index 672ef5524..807aa626b 100644
--- a/modules/extra/m_xmlrpc_main.cpp
+++ b/modules/extra/m_xmlrpc_main.cpp
@@ -172,10 +172,10 @@ class MyXMLRPCEvent : public XMLRPCEvent
 				request.reply("invite" + stringify(++count), iface->Sanitize(its.first->second));
 
 			Anope::string users;
-			for (CUserList::const_iterator it = c->users.begin(); it != c->users.end(); ++it)
+			for (Channel::ChanUserList::const_iterator it = c->users.begin(); it != c->users.end(); ++it)
 			{
-				UserContainer *uc = *it;
-				users += uc->status->BuildModePrefixList() + uc->user->nick + " ";
+				ChanUserContainer *uc = *it;
+				users += uc->status.BuildModePrefixList() + uc->user->nick + " ";
 			}
 			if (!users.empty())
 			{
@@ -224,10 +224,10 @@ class MyXMLRPCEvent : public XMLRPCEvent
 			}
 
 			Anope::string channels;
-			for (UChannelList::const_iterator it = u->chans.begin(); it != u->chans.end(); ++it)
+			for (User::ChanUserList::const_iterator it = u->chans.begin(); it != u->chans.end(); ++it)
 			{
-				ChannelContainer *cc = *it;
-				channels += cc->status->BuildModePrefixList() + cc->chan->name + " ";
+				ChanUserContainer *cc = *it;
+				channels += cc->status.BuildModePrefixList() + cc->chan->name + " ";
 			}
 			if (!channels.empty())
 			{