diff options
| author |  Sadie Powell | 2021-04-06 20:06:18 +0100 |
|---|---|---|
| committer | Sadie Powell | 2021-04-07 10:36:11 +0100 |
| commit | 942fd2bcfd384a12c900999fe663202c87319a68 (patch) | |
| tree | c2bad1906af27afbc3c7d96c3e5ca3c27c83f090 /src/modules/m_monitor.cpp | |
| parent | Merge branch 'insp3' into master. (diff) | |
Switch simple iterator loops to use range-based for loops.
Diffstat (limited to 'src/modules/m_monitor.cpp')
| -rw-r--r-- | src/modules/m_monitor.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/modules/m_monitor.cpp b/src/modules/m_monitor.cpp index e4afab26a..d65b1b5e0 100644 --- a/src/modules/m_monitor.cpp +++ b/src/modules/m_monitor.cpp @@ -89,11 +89,8 @@ class IRCv3::Monitor::Manager { std::string ret; const ExtData* extdata = static_cast<ExtData*>(item); - for (WatchedList::const_iterator i = extdata->list.begin(); i != extdata->list.end(); ++i) - { - const Entry* entry = *i; + for (const auto& entry : extdata->list) ret.append(entry->GetNick()).push_back(' '); - } if (!ret.empty()) ret.erase(ret.size()-1); return ret; @@ -337,11 +334,8 @@ class CommandMonitor : public SplitCommand user->CommandFloodPenalty += ListPenalty; const IRCv3::Monitor::WatchedList& list = manager.GetWatched(user); ReplyBuilder out(user, RPL_MONLIST); - for (IRCv3::Monitor::WatchedList::const_iterator i = list.begin(); i != list.end(); ++i) - { - IRCv3::Monitor::Entry* entry = *i; + for (const auto& entry : list) out.Add(entry->GetNick()); - } out.Flush(); user->WriteNumeric(RPL_ENDOFMONLIST, "End of MONITOR list"); } @@ -352,10 +346,8 @@ class CommandMonitor : public SplitCommand ReplyBuilder online(user, RPL_MONONLINE); ReplyBuilder offline(user, RPL_MONOFFLINE); - const IRCv3::Monitor::WatchedList& list = manager.GetWatched(user); - for (IRCv3::Monitor::WatchedList::const_iterator i = list.begin(); i != list.end(); ++i) + for (const auto& entry : manager.GetWatched(user)) { - IRCv3::Monitor::Entry* entry = *i; ReplyBuilder& out = (IRCv3::Monitor::Manager::FindNick(entry->GetNick()) ? online : offline); out.Add(entry->GetNick()); } @@ -384,11 +376,8 @@ class ModuleMonitor if (!list) return; - for (IRCv3::Monitor::WatcherList::const_iterator i = list->begin(); i != list->end(); ++i) - { - LocalUser* curr = *i; + for (const auto& curr : *list) curr->WriteNumeric(numeric, nick); - } } public: |