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_anticaps.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/modules/m_anticaps.cpp') diff --git a/src/modules/m_anticaps.cpp b/src/modules/m_anticaps.cpp index 645b2b916..078784482 100644 --- a/src/modules/m_anticaps.cpp +++ b/src/modules/m_anticaps.cpp @@ -187,14 +187,12 @@ class ModuleAntiCaps : public Module auto tag = ServerInstance->Config->ConfValue("anticaps"); uppercase.reset(); - const std::string upper = tag->getString("uppercase", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1); - for (std::string::const_iterator iter = upper.begin(); iter != upper.end(); ++iter) - uppercase.set(static_cast(*iter)); + for (const auto& chr : tag->getString("uppercase", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1)) + uppercase.set(static_cast(chr)); lowercase.reset(); - const std::string lower = tag->getString("lowercase", "abcdefghijklmnopqrstuvwxyz"); - for (std::string::const_iterator iter = lower.begin(); iter != lower.end(); ++iter) - lowercase.set(static_cast(*iter)); + for (const auto& chr : tag->getString("lowercase", "abcdefghijklmnopqrstuvwxyz", 1)) + lowercase.set(static_cast(chr)); } ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) override @@ -244,12 +242,11 @@ class ModuleAntiCaps : public Module // Count the characters to see how many upper case and // ignored (non upper or lower) characters there are. size_t upper = 0; - for (std::string::const_iterator iter = msgbody.begin(); iter != msgbody.end(); ++iter) + for (const auto& chr : msgbody) { - unsigned char chr = static_cast(*iter); - if (uppercase.test(chr)) + if (uppercase.test(static_cast(chr))) upper += 1; - else if (!lowercase.test(chr)) + else if (!lowercase.test(static_cast(chr))) length -= 1; } -- cgit v1.3.1-10-gc9f91