Merge branch 'insp20' into master.

[user/henk/code/inspircd.git] / src / coremods / core_lusers.cpp

diff --git a/src/coremods/core_lusers.cpp b/src/coremods/core_lusers.cpp
index 2529ca42bd37fddc06aa2baeaebfbb358c863402..a995e59e7fa6cffabf3c84e2a4f9aa83764a6e6f 100644 (file)
--- a/src/coremods/core_lusers.cpp
+++ b/src/coremods/core_lusers.cpp
@@ -61,7 +61,7 @@ class CommandLusers : public Command
         * @param user The user issuing the command
         * @return A value from CmdResult to indicate command success or failure.
         */
-       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE;
 };
 
 /** Handle /LUSERS
@@ -84,19 +84,19 @@ CmdResult CommandLusers::Handle (const std::vector<std::string>&, User *user)
 
        counters.UpdateMaxUsers();
 
-       user->WriteNumeric(RPL_LUSERCLIENT, ":There are %d users and %d invisible on %d servers",
-                       n_users - counters.invisible, counters.invisible, n_serv);
+       user->WriteNumeric(RPL_LUSERCLIENT, InspIRCd::Format("There are %d users and %d invisible on %d servers",
+                       n_users - counters.invisible, counters.invisible, n_serv));
 
        if (ServerInstance->Users->OperCount())
-               user->WriteNumeric(RPL_LUSEROP, "%d :operator(s) online", ServerInstance->Users->OperCount());
+               user->WriteNumeric(RPL_LUSEROP, ServerInstance->Users.OperCount(), "operator(s) online");
 
        if (ServerInstance->Users->UnregisteredUserCount())
-               user->WriteNumeric(RPL_LUSERUNKNOWN, "%d :unknown connections", ServerInstance->Users->UnregisteredUserCount());
+               user->WriteNumeric(RPL_LUSERUNKNOWN, ServerInstance->Users.UnregisteredUserCount(), "unknown connections");
 
-       user->WriteNumeric(RPL_LUSERCHANNELS, "%lu :channels formed", (unsigned long)ServerInstance->GetChans().size());
-       user->WriteNumeric(RPL_LUSERME, ":I have %d clients and %d servers", ServerInstance->Users->LocalUserCount(),n_local_servs);
-       user->WriteNumeric(RPL_LOCALUSERS, ":Current local users: %d  Max: %d", ServerInstance->Users->LocalUserCount(), counters.max_local);
-       user->WriteNumeric(RPL_GLOBALUSERS, ":Current global users: %d  Max: %d", n_users, counters.max_global);
+       user->WriteNumeric(RPL_LUSERCHANNELS, ServerInstance->GetChans().size(), "channels formed");
+       user->WriteNumeric(RPL_LUSERME, InspIRCd::Format("I have %d clients and %d servers", ServerInstance->Users.LocalUserCount(), n_local_servs));
+       user->WriteNumeric(RPL_LOCALUSERS, InspIRCd::Format("Current local users: %d  Max: %d", ServerInstance->Users.LocalUserCount(), counters.max_local));
+       user->WriteNumeric(RPL_GLOBALUSERS, InspIRCd::Format("Current global users: %d  Max: %d", n_users, counters.max_global));
 
        return CMD_SUCCESS;
 }
@@ -110,7 +110,7 @@ public:
        {
        }
 
-       void AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding)
+       void AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding) CXX11_OVERRIDE
        {
                if (dest->registered != REG_ALL)
                        return;
@@ -151,20 +151,20 @@ class ModuleLusers : public Module
        {
        }
 
-       void OnPostConnect(User* user)
+       void OnPostConnect(User* user) CXX11_OVERRIDE
        {
                counters.UpdateMaxUsers();
                if (user->IsModeSet(invisiblemode))
                        counters.invisible++;
        }
 
-       void OnUserQuit(User* user, const std::string& message, const std::string& oper_message)
+       void OnUserQuit(User* user, const std::string& message, const std::string& oper_message) CXX11_OVERRIDE
        {
                if (user->IsModeSet(invisiblemode))
                        counters.invisible--;
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("LUSERS", VF_VENDOR | VF_CORE);
        }