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_spanningtree/override_stats.cpp | 5 ++---
src/modules/m_spanningtree/treeserver.cpp | 4 +---
src/modules/m_spanningtree/utils.cpp | 9 +++------
3 files changed, 6 insertions(+), 12 deletions(-)
(limited to 'src/modules/m_spanningtree')
diff --git a/src/modules/m_spanningtree/override_stats.cpp b/src/modules/m_spanningtree/override_stats.cpp
index 78d7ee226..299d1db6e 100644
--- a/src/modules/m_spanningtree/override_stats.cpp
+++ b/src/modules/m_spanningtree/override_stats.cpp
@@ -47,10 +47,9 @@ ModResult ModuleSpanningTree::OnStats(Stats::Context& stats)
}
else if (stats.GetSymbol() == 'U')
{
- ConfigTagList tags = ServerInstance->Config->ConfTags("uline");
- for (ConfigIter i = tags.first; i != tags.second; ++i)
+ for (auto& [_, tag] : ServerInstance->Config->ConfTags("uline"))
{
- std::string name = i->second->getString("server");
+ std::string name = tag->getString("server");
if (!name.empty())
stats.AddRow(248, 'U', name);
}
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
index 63baaf706..ce4469a9a 100644
--- a/src/modules/m_spanningtree/treeserver.cpp
+++ b/src/modules/m_spanningtree/treeserver.cpp
@@ -242,10 +242,8 @@ void TreeServer::CheckULine()
{
uline = silentuline = false;
- ConfigTagList tags = ServerInstance->Config->ConfTags("uline");
- for (ConfigIter i = tags.first; i != tags.second; ++i)
+ for (auto& [_, tag] : ServerInstance->Config->ConfTags("uline"))
{
- ConfigTag* tag = i->second;
std::string server = tag->getString("server");
if (irc::equals(server, GetName()))
{
diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index dd4575445..8c3786aff 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -254,10 +254,9 @@ void SpanningTreeUtilities::ReadConfiguration()
AutoconnectBlocks.clear();
LinkBlocks.clear();
- ConfigTagList tags = ServerInstance->Config->ConfTags("link");
- for(ConfigIter i = tags.first; i != tags.second; ++i)
+
+ for (auto& [_, tag] : ServerInstance->Config->ConfTags("link"))
{
- ConfigTag* tag = i->second;
auto L = std::make_shared(tag);
irc::spacesepstream sep = tag->getString("allowmask");
@@ -310,10 +309,8 @@ void SpanningTreeUtilities::ReadConfiguration()
LinkBlocks.push_back(L);
}
- tags = ServerInstance->Config->ConfTags("autoconnect");
- for(ConfigIter i = tags.first; i != tags.second; ++i)
+ for (auto& [_, tag] : ServerInstance->Config->ConfTags("autoconnect"))
{
- ConfigTag* tag = i->second;
auto A = std::make_shared(tag);
A->Period = tag->getDuration("period", 60, 1);
A->NextConnectTime = ServerInstance->Time() + A->Period;
--
cgit v1.3.1-10-gc9f91