Start migrating to range-based for loops.

1 files changed, 6 insertions, 8 deletions

diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index 9ca7aed33..c554cc19d 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -122,8 +122,8 @@ class HybridProto : public IRCDProto
 				uc->status.Clear();
 
 			BotInfo *setter = BotInfo::Find(u->GetUID());
-			for (size_t i = 0; i < cs.Modes().length(); ++i)
-				c->SetMode(setter, ModeManager::FindChannelModeByChar(cs.Modes()[i]), u->GetUID(), false);
+			for (auto mode : cs.Modes())
+				c->SetMode(setter, ModeManager::FindChannelModeByChar(mode), u->GetUID(), false);
 
 			if (uc)
 				uc->status = cs;
@@ -140,9 +140,9 @@ class HybridProto : public IRCDProto
 				 * No user (this akill was just added), and contains nick and/or realname.
 				 * Find users that match and ban them.
 				 */
-				for (user_map::const_iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it)
-					if (x->manager->Check(it->second, x))
-						this->SendAkill(it->second, x);
+				for (const auto &[_, user] : UserListByNick)
+					if (x->manager->Check(user, x))
+						this->SendAkill(user, x);
 
 				return;
 			}
@@ -305,10 +305,8 @@ class HybridProto : public IRCDProto
 		if (a == '-' || a == '_' || a == '.')
 			return false;
 
-		for (i = 0; i < ident.length(); ++i)
+		for (const auto c : ident)
 		{
-			const char &c = ident[i];
-
 			/* A tilde can only be used as the first character of a user name. */
 			if (c == '~' && i == 0)
 				continue;