diff options
| author | Sadie Powell <sadie@witchery.services> | 2023-10-10 21:14:50 +0100 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2023-10-11 15:51:52 +0100 |
| commit | a3241065c55fd2a69e8793b89a5d0b1a957b3fd0 (patch) | |
| tree | 82f80ce2f3bbbdc1c1ef05fe611093cf0b34eab6 /modules/webcpanel/pages | |
| parent | dc371aad6d059dbf7f30f6878c680532bedd4146 (diff) | |
Start migrating to range-based for loops.
Diffstat (limited to 'modules/webcpanel/pages')
| -rw-r--r-- | modules/webcpanel/pages/chanserv/drop.cpp | 3 | ||||
| -rw-r--r-- | modules/webcpanel/pages/chanserv/modes.cpp | 9 | ||||
| -rw-r--r-- | modules/webcpanel/pages/chanserv/utils.cpp | 4 | ||||
| -rw-r--r-- | modules/webcpanel/pages/memoserv/memos.cpp | 4 | ||||
| -rw-r--r-- | modules/webcpanel/pages/nickserv/access.cpp | 4 | ||||
| -rw-r--r-- | modules/webcpanel/pages/nickserv/alist.cpp | 4 |
6 files changed, 10 insertions, 18 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; |
