aboutsummaryrefslogtreecommitdiff
path: root/src/modules/m_clearchan.cpp
diff options
context:
space:
mode:
authorGravatar Sadie Powell2021-04-06 20:06:18 +0100
committerGravatar Sadie Powell2021-04-07 10:36:11 +0100
commit942fd2bcfd384a12c900999fe663202c87319a68 (patch)
treec2bad1906af27afbc3c7d96c3e5ca3c27c83f090 /src/modules/m_clearchan.cpp
parentMerge branch 'insp3' into master. (diff)
Switch simple iterator loops to use range-based for loops.
Diffstat (limited to 'src/modules/m_clearchan.cpp')
-rw-r--r--src/modules/m_clearchan.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp
index 42159b0e6..543f47d3d 100644
--- a/src/modules/m_clearchan.cpp
+++ b/src/modules/m_clearchan.cpp
@@ -174,10 +174,9 @@ class ModuleClearChan : public Module
}
}
- const Channel::MemberMap& users = cmd.activechan->GetUsers();
- for (Channel::MemberMap::const_iterator i = users.begin(); i != users.end(); ++i)
+ for (const auto& [member, _] : cmd.activechan->GetUsers())
{
- LocalUser* curr = IS_LOCAL(i->first);
+ LocalUser* curr = IS_LOCAL(member);
if (!curr)
continue;
@@ -204,10 +203,8 @@ class ModuleClearChan : public Module
{
// Hide the KICK from all non-opers
User* leaving = memb->user;
- const Channel::MemberMap& users = memb->chan->GetUsers();
- for (Channel::MemberMap::const_iterator i = users.begin(); i != users.end(); ++i)
+ for (const auto& [curr, _] : memb->chan->GetUsers())
{
- User* curr = i->first;
if ((IS_LOCAL(curr)) && (!curr->IsOper()) && (curr != leaving))
excepts.insert(curr);
}