From b591e8cdc8b1bc40a6a59b54dcb6266d9656b616 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 28 Dec 2012 10:37:54 -0500 Subject: Use the same object for chanusercontainer and userchancontainer --- modules/pseudoclients/memoserv.cpp | 4 ++-- modules/pseudoclients/nickserv.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'modules/pseudoclients') diff --git a/modules/pseudoclients/memoserv.cpp b/modules/pseudoclients/memoserv.cpp index 350280caa..ba7db4654 100644 --- a/modules/pseudoclients/memoserv.cpp +++ b/modules/pseudoclients/memoserv.cpp @@ -99,9 +99,9 @@ class MyMemoServService : public MemoServService 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) { - UserContainer *cu = *it; + ChanUserContainer *cu = *it; if (ci->AccessFor(cu->user).HasPriv("MEMO")) { diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp index 744339f7d..dd7efcabc 100644 --- a/modules/pseudoclients/nickserv.cpp +++ b/modules/pseudoclients/nickserv.cpp @@ -247,9 +247,9 @@ class NickServCore : public Module } if (Config->NSModeOnID) - for (UChannelList::iterator it = u->chans.begin(), it_end = u->chans.end(); it != it_end; ++it) + for (User::ChanUserList::iterator it = u->chans.begin(), it_end = u->chans.end(); it != it_end; ++it) { - ChannelContainer *cc = *it; + ChanUserContainer *cc = *it; Channel *c = cc->chan; if (c) c->SetCorrectModes(u, true, true); @@ -286,9 +286,9 @@ class NickServCore : public Module void OnNickUpdate(User *u) anope_override { - for (UChannelList::iterator it = u->chans.begin(), it_end = u->chans.end(); it != it_end; ++it) + for (User::ChanUserList::iterator it = u->chans.begin(), it_end = u->chans.end(); it != it_end; ++it) { - ChannelContainer *cc = *it; + ChanUserContainer *cc = *it; Channel *c = cc->chan; if (c) c->SetCorrectModes(u, true, true); -- cgit