Start migrating to range-based for loops.

8 files changed, 24 insertions, 36 deletions

diff --git a/modules/webcpanel/pages/chanserv/drop.cpp b/modules/webcpanel/pages/chanserv/drop.cpp
index 3416635d7..57be2055d 100644
--- a/modules/webcpanel/pages/chanserv/drop.cpp
+++ b/modules/webcpanel/pages/chanserv/drop.cpp
@@ -33,9 +33,8 @@ bool WebCPanel::ChanServ::Drop::OnRequest(HTTPProvider *server, const Anope::str
 
 	std::deque<ChannelInfo *> queue;
 	na->nc->GetChannelReferences(queue);
-	for (unsigned i = 0; i < queue.size(); ++i)
+	for (auto *ci : queue)
 	{
-		ChannelInfo *ci = queue[i];
 		if ((ci->HasExt("SECUREFOUNDER") ? ci->AccessFor(na->nc).founder : ci->AccessFor(na->nc).HasPriv("FOUNDER")) || (na->nc->IsServicesOper() && na->nc->o->ot->HasCommand("chanserv/drop")))
 		{
 			replacements["CHANNEL_NAMES"] = ci->name;
diff --git a/modules/webcpanel/pages/chanserv/modes.cpp b/modules/webcpanel/pages/chanserv/modes.cpp
index c9fc0c59e..7e3de86d2 100644
--- a/modules/webcpanel/pages/chanserv/modes.cpp
+++ b/modules/webcpanel/pages/chanserv/modes.cpp
@@ -57,10 +57,8 @@ bool WebCPanel::ChanServ::Modes::OnRequest(HTTPProvider *server, const Anope::st
 	replacements["MODE"] = "YES";
 
 	/* build a list with the names of all listmodes */
-	for (unsigned i = 0; i < ModeManager::GetChannelModes().size(); ++i)
+	for (auto *cm : ModeManager::GetChannelModes())
 	{
-		ChannelMode *cm = ModeManager::GetChannelModes()[i];
-
 		if (cm->type == MODE_LIST && cm->mchar)
 			replacements["LISTMODES"] = cm->mchar;
 	}
@@ -94,9 +92,8 @@ bool WebCPanel::ChanServ::Modes::OnRequest(HTTPProvider *server, const Anope::st
 			WebPanel::RunCommand(client, na->nc->display, na->nc, "ChanServ", "chanserv/mode", params, replacements);
 		}
 
-		std::vector<Anope::string> v = c->GetModeList(cm->name);
-		for (unsigned int i = 0; i < v.size(); ++i)
-			replacements["MASKS"] = v[i];
+		for (const auto &mask : c->GetModeList(cm->name))
+			replacements["MASKS"] = mask;
 	}
 
 	Page.Serve(server, page_name, client, message, reply, replacements);
diff --git a/modules/webcpanel/pages/chanserv/utils.cpp b/modules/webcpanel/pages/chanserv/utils.cpp
index 35b302ba6..c0b300541 100644
--- a/modules/webcpanel/pages/chanserv/utils.cpp
+++ b/modules/webcpanel/pages/chanserv/utils.cpp
@@ -27,10 +27,8 @@ void BuildChanList(NickAlias *na, TemplateFileServer::Replacements &replacements
 	na->nc->GetChannelReferences(queue);
 	std::sort(queue.begin(), queue.end(), ChannelSort);
 
-	for (unsigned i = 0; i < queue.size(); ++i)
+	for (auto *ci : queue)
 	{
-		ChannelInfo *ci = queue[i];
-
 		if (na->nc != ci->GetFounder() && ci->AccessFor(na->nc).empty())
 			continue;
 
diff --git a/modules/webcpanel/pages/memoserv/memos.cpp b/modules/webcpanel/pages/memoserv/memos.cpp
index b191f8e31..d134820b4 100644
--- a/modules/webcpanel/pages/memoserv/memos.cpp
+++ b/modules/webcpanel/pages/memoserv/memos.cpp
@@ -18,9 +18,9 @@ bool WebCPanel::MemoServ::Memos::OnRequest(HTTPProvider *server, const Anope::st
 	const MemoInfo *mi;
 	Memo *m;
 
-	for (registered_channel_map::const_iterator it = RegisteredChannelList->begin(), it_end = RegisteredChannelList->end(); it != it_end; ++it)
+	for (const auto &[_, ci2] : *RegisteredChannelList)
 	{
-		ci = it->second;
+		ci = ci2;
 
 		if (ci->AccessFor(na->nc).HasPriv("MEMO"))
 		{
diff --git a/modules/webcpanel/pages/nickserv/access.cpp b/modules/webcpanel/pages/nickserv/access.cpp
index 101d28a38..0614009dc 100644
--- a/modules/webcpanel/pages/nickserv/access.cpp
+++ b/modules/webcpanel/pages/nickserv/access.cpp
@@ -30,8 +30,8 @@ bool WebCPanel::NickServ::Access::OnRequest(HTTPProvider *server, const Anope::s
 		WebPanel::RunCommand(client, na->nc->display, na->nc, "NickServ", "nickserv/access", params, replacements);
 	}
 
-	for (unsigned i = 0; i < na->nc->access.size(); ++i)
-		replacements["ACCESS"] = na->nc->access[i];
+	for (const auto &access : na->nc->access)
+		replacements["ACCESS"] = access;
 
 	TemplateFileServer page("nickserv/access.html");
 	page.Serve(server, page_name, client, message, reply, replacements);
diff --git a/modules/webcpanel/pages/nickserv/alist.cpp b/modules/webcpanel/pages/nickserv/alist.cpp
index 924323e05..71320f7d9 100644
--- a/modules/webcpanel/pages/nickserv/alist.cpp
+++ b/modules/webcpanel/pages/nickserv/alist.cpp
@@ -24,10 +24,8 @@ bool WebCPanel::NickServ::Alist::OnRequest(HTTPProvider *server, const Anope::st
 
 	int chan_count = 0;
 
-	for (unsigned q = 0; q < queue.size(); ++q)
+	for (auto *ci : queue)
 	{
-		ChannelInfo *ci = queue[q];
-
 		if (ci->GetFounder() == na->nc)
 		{
 			++chan_count;
diff --git a/modules/webcpanel/template_fileserver.cpp b/modules/webcpanel/template_fileserver.cpp
index a2ea495cc..da390bad8 100644
--- a/modules/webcpanel/template_fileserver.cpp
+++ b/modules/webcpanel/template_fileserver.cpp
@@ -25,28 +25,24 @@ struct ForLoop
 
 	ForLoop(size_t s, TemplateFileServer::Replacements &r, const std::vector<Anope::string> &v, const std::vector<Anope::string> &r_names) : start(s), vars(v)
 	{
-		for (unsigned i = 0; i < r_names.size(); ++i)
-			ranges.push_back(r.equal_range(r_names[i]));
+		for (const auto &r_name : r_names)
+			ranges.push_back(r.equal_range(r_name));
 	}
 
 	void increment(const TemplateFileServer::Replacements &r)
 	{
-		for (unsigned i = 0; i < ranges.size(); ++i)
+		for (auto &[begin, end] : ranges)
 		{
-			range &ra = ranges[i];
-
-			if (ra.first != r.end() && ra.first != ra.second)
-				++ra.first;
+			if (begin != r.end() && begin != end)
+				++begin;
 		}
 	}
 
 	bool finished(const TemplateFileServer::Replacements &r) const
 	{
-		for (unsigned i = 0; i < ranges.size(); ++i)
+		for (const auto &[begin, end] : ranges)
 		{
-			const range &ra = ranges[i];
-
-			if (ra.first != r.end() && ra.first != ra.second)
+			if (begin != r.end() && begin != end)
 				return false;
 		}
 
diff --git a/modules/webcpanel/webcpanel.h b/modules/webcpanel/webcpanel.h
index d73c6320d..e432264c8 100644
--- a/modules/webcpanel/webcpanel.h
+++ b/modules/webcpanel/webcpanel.h
@@ -105,16 +105,17 @@ class WebPanelProtectedPage : public WebPanelPage
 
 		Anope::string sections, get;
 
-		for (std::map<Anope::string, Anope::string>::iterator it = message.get_data.begin(), it_end = message.get_data.end(); it != it_end; ++it)
-			if (this->GetData().count(it->first) > 0)
-				get += "&" + it->first + "=" + HTTPUtils::URLEncode(it->second);
+		for (const auto &[key, value] : message.get_data)
+		{
+			if (this->GetData().count(key) > 0)
+				get += "&" + key + "=" + HTTPUtils::URLEncode(value);
+		}
 		if (get.empty() == false)
 			get = "?" + get.substr(1);
 
 		Section *ns = NULL;
-		for (unsigned i = 0; i < panel->sections.size(); ++i)
+		for (auto &s : panel->sections)
 		{
-			Section& s = panel->sections[i];
 			if (s.name == this->category)
 				ns = &s;
 			replacements["CATEGORY_URLS"] = s.subsections[0].url;
@@ -124,9 +125,8 @@ class WebPanelProtectedPage : public WebPanelPage
 		if (ns)
 		{
 			sections = "";
-			for (unsigned i = 0; i < ns->subsections.size(); ++i)
+			for (const auto &ss : ns->subsections)
 			{
-				SubSection& ss = ns->subsections[i];
 				replacements["SUBCATEGORY_URLS"] = ss.url;
 				replacements["SUBCATEGORY_GETS"] = get;
 				replacements["SUBCATEGORY_NAMES"] = ss.name;