Change storage of UserManager::all_opers to be a vector

[user/henk/code/inspircd.git] / src / snomasks.cpp

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index fa8e5ab600a26f89ee4fe2dbc32030c46efc72a4..738d0970d480987c010783e8fd63053000efb7a5 100644 (file)
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -47,7 +47,7 @@ void SnomaskManager::WriteGlobalSno(char letter, const std::string& text)
 {
        WriteToSnoMask(letter, text);
        letter = toupper(letter);
-       ServerInstance->PI->SendSNONotice(std::string(1, letter), text);
+       ServerInstance->PI->SendSNONotice(letter, text);
 }
 
 void SnomaskManager::WriteToSnoMask(char letter, const char* text, ...)
@@ -115,7 +115,7 @@ void Snomask::Flush()
                std::string desc = GetDescription(LastLetter);
                std::string msg = "(last message repeated " + ConvToStr(Count) + " times)";
 
-               FOREACH_MOD(I_OnSendSnotice, OnSendSnotice(LastLetter, desc, msg));
+               FOREACH_MOD(OnSendSnotice, (LastLetter, desc, msg));
                Snomask::Send(LastLetter, desc, msg);
        }
 
@@ -132,8 +132,8 @@ void Snomask::Send(char letter, const std::string& desc, const std::string& msg)
        std::string finalmsg = "*** ";
        finalmsg.append(log);
        /* Only opers can receive snotices, so we iterate the oper list */
-       const std::list<User*>& opers = ServerInstance->Users->all_opers;
-       for (std::list<User*>::const_iterator i = opers.begin(); i != opers.end(); ++i)
+       const UserManager::OperList& opers = ServerInstance->Users->all_opers;
+       for (UserManager::OperList::const_iterator i = opers.begin(); i != opers.end(); ++i)
        {
                User* user = *i;
                // IsNoticeMaskSet() returns false for opers who aren't +s, no need to check for it seperately