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_codepage.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

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

diff --git a/src/modules/m_codepage.cpp b/src/modules/m_codepage.cpp
index 4884da5d6..d59078e44 100644
--- a/src/modules/m_codepage.cpp
+++ b/src/modules/m_codepage.cpp
@@ -71,18 +71,16 @@ class ModuleCodepage
 	void RehashHashmap(T& hashmap)
 	{
 		T newhash(hashmap.bucket_count());
-		for (typename T::const_iterator i = hashmap.begin(); i != hashmap.end(); ++i)
-			newhash.insert(std::make_pair(i->first, i->second));
+		for (const auto& [key, value] : hashmap)
+			newhash.emplace(key, value);
 		hashmap.swap(newhash);
 	}
 
 	void CheckDuplicateNick()
 	{
 		insp::flat_set<std::string, irc::insensitive_swo> duplicates;
-		const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
-		for (UserManager::LocalList::const_iterator iter = list.begin(); iter != list.end(); ++iter)
+		for (auto* user : ServerInstance->Users.GetLocalUsers())
 		{
-			LocalUser* user = *iter;
 			if (user->nick != user->uuid && !duplicates.insert(user->nick).second)
 			{
 				user->WriteNumeric(RPL_SAVENICK, user->uuid, "Your nickname is no longer available.");
@@ -93,10 +91,8 @@ class ModuleCodepage
 
 	void CheckInvalidNick()
 	{
-		const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
-		for (UserManager::LocalList::const_iterator iter = list.begin(); iter != list.end(); ++iter)
+		for (auto* user : ServerInstance->Users.GetLocalUsers())
 		{
-			LocalUser* user = *iter;
 			if (user->nick != user->uuid && !ServerInstance->IsNick(user->nick))
 			{
 				user->WriteNumeric(RPL_SAVENICK, user->uuid, "Your nickname is no longer valid.");
-- 
cgit v1.3.1-10-gc9f91