From 441bd151da733d32e194de6e4a1744ae273b83ee Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sat, 31 Oct 2020 20:03:19 +0000 Subject: Add stdalgo::iterator_range and switch config tag reading to use it. This allows us to use range-based for loops which were not possible with the previous config tag system. --- src/modules/m_denychans.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/modules/m_denychans.cpp') diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp index 745170221..3fa768953 100644 --- a/src/modules/m_denychans.cpp +++ b/src/modules/m_denychans.cpp @@ -71,11 +71,9 @@ class ModuleDenyChannels : public Module void ReadConfig(ConfigStatus& status) override { GoodChannels goodchans; - ConfigTagList tags = ServerInstance->Config->ConfTags("goodchan"); - for (ConfigIter iter = tags.first; iter != tags.second; ++iter) - { - ConfigTag* tag = iter->second; + for (auto& [_, tag] : ServerInstance->Config->ConfTags("goodchan")) + { // Ensure that we have the parameter. const std::string name = tag->getString("name"); if (name.empty()) @@ -85,11 +83,8 @@ class ModuleDenyChannels : public Module } BadChannels badchans; - tags = ServerInstance->Config->ConfTags("badchan"); - for (ConfigIter i = tags.first; i != tags.second; ++i) + for (auto& [_, tag] : ServerInstance->Config->ConfTags("badchan")) { - ConfigTag* tag = i->second; - // Ensure that we have the parameter. const std::string name = tag->getString("name"); if (name.empty()) -- cgit v1.3.1-10-gc9f91