From 942fd2bcfd384a12c900999fe663202c87319a68 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 6 Apr 2021 20:06:18 +0100
Subject: Switch simple iterator loops to use range-based for loops.

---
 src/modules/m_channames.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/modules/m_channames.cpp')

diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index e853ba78b..bbfc9b030 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -37,10 +37,9 @@ bool NewIsChannelHandler::Call(const std::string& channame)
 	if (channame.empty() || channame.length() > ServerInstance->Config->Limits.MaxChannel || channame[0] != '#')
 		return false;
 
-	for (std::string::const_iterator c = channame.begin(); c != channame.end(); ++c)
+	for (const auto& chr : channame)
 	{
-		unsigned int i = *c & 0xFF;
-		if (!allowedmap[i])
+		if (!allowedmap[static_cast<unsigned char>(chr)])
 			return false;
 	}
 
@@ -137,10 +136,11 @@ class ModuleChannelNames : public Module
 	{
 		if (badchan)
 		{
-			const Channel::MemberMap& users = memb->chan->GetUsers();
-			for (Channel::MemberMap::const_iterator i = users.begin(); i != users.end(); ++i)
-				if (i->first != memb->user)
-					except_list.insert(i->first);
+			for (const auto& [user, _] : memb->chan->GetUsers())
+			{
+				if (user != memb->user)
+					except_list.insert(user);
+			}
 		}
 	}
 
-- 
cgit v1.3.1-10-gc9f91