Add the override keyword in places that it is missing.

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

diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp
index 90a630f9cff6aa98bcee0e27a89b9f1be8016185..1dd087e12415009ccd01ba5dbb3f42d8c361d3dd 100644 (file)
--- a/src/coremods/core_whois.cpp
+++ b/src/coremods/core_whois.cpp
@@ -55,7 +55,7 @@ class CommandWhois : public SplitCommand
        Events::ModuleEventProvider evprov;
        Events::ModuleEventProvider lineevprov;
 
-       void DoWhois(LocalUser* user, User* dest, unsigned long signon, unsigned long idle);
+       void DoWhois(LocalUser* user, User* dest, time_t signon, unsigned long idle);
        void SendChanList(WhoisContextImpl& whois);
 
  public:
@@ -78,8 +78,8 @@ class CommandWhois : public SplitCommand
         * @param user The user issuing the command
         * @return A value from CmdResult to indicate command success or failure.
         */
-       CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user);
-       CmdResult HandleRemote(const std::vector<std::string>& parameters, RemoteUser* target);
+       CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user) CXX11_OVERRIDE;
+       CmdResult HandleRemote(const std::vector<std::string>& parameters, RemoteUser* target) CXX11_OVERRIDE;
 };
 
 class WhoisNumericSink
@@ -101,8 +101,9 @@ class WhoisChanListNumericBuilder : public Numeric::GenericBuilder<' ', false, W
 {
  public:
        WhoisChanListNumericBuilder(WhoisContextImpl& whois)
-               : Numeric::GenericBuilder<' ', false, WhoisNumericSink>(WhoisNumericSink(whois), 319, true, whois.GetSource()->nick.size() + whois.GetTarget()->nick.size() + 1)
+               : Numeric::GenericBuilder<' ', false, WhoisNumericSink>(WhoisNumericSink(whois), 319, false, whois.GetSource()->nick.size() + whois.GetTarget()->nick.size() + 1)
        {
+               GetNumeric().push(whois.GetTarget()->nick).push(std::string());
        }
 };
 
@@ -172,14 +173,14 @@ void CommandWhois::SendChanList(WhoisContextImpl& whois)
        chanlist.Flush(whois);
 }
 
-void CommandWhois::DoWhois(LocalUser* user, User* dest, unsigned long signon, unsigned long idle)
+void CommandWhois::DoWhois(LocalUser* user, User* dest, time_t signon, unsigned long idle)
 {
        WhoisContextImpl whois(user, dest, lineevprov);
 
-       whois.SendLine(311, dest->ident, dest->dhost, '*', dest->fullname);
+       whois.SendLine(311, dest->ident, dest->GetDisplayedHost(), '*', dest->fullname);
        if (whois.IsSelfWhois() || user->HasPrivPermission("users/auspex"))
        {
-               whois.SendLine(378, InspIRCd::Format("is connecting from %s@%s %s", dest->ident.c_str(), dest->host.c_str(), dest->GetIPString().c_str()));
+               whois.SendLine(378, InspIRCd::Format("is connecting from %s@%s %s", dest->ident.c_str(), dest->GetRealHost().c_str(), dest->GetIPString().c_str()));
        }
 
        SendChanList(whois);
@@ -210,11 +211,11 @@ void CommandWhois::DoWhois(LocalUser* user, User* dest, unsigned long signon, un
        {
                if (dest->IsModeSet(snomaskmode))
                {
-                       whois.SendLine(379, InspIRCd::Format("is using modes +%s %s", dest->FormatModes(), snomaskmode->GetUserParameter(dest).c_str()));
+                       whois.SendLine(379, InspIRCd::Format("is using modes %s %s", dest->GetModeLetters().c_str(), snomaskmode->GetUserParameter(dest).c_str()));
                }
                else
                {
-                       whois.SendLine(379, InspIRCd::Format("is using modes +%s", dest->FormatModes()));
+                       whois.SendLine(379, InspIRCd::Format("is using modes %s", dest->GetModeLetters().c_str()));
                }
        }
 
@@ -246,7 +247,7 @@ CmdResult CommandWhois::HandleRemote(const std::vector<std::string>& parameters,
        if (!localuser)
                return CMD_FAILURE;
 
-       unsigned long idle = ConvToInt(parameters.back());
+       unsigned long idle = ConvToNum<unsigned long>(parameters.back());
        DoWhois(localuser, target, target->signon, idle);
 
        return CMD_SUCCESS;
@@ -255,8 +256,9 @@ CmdResult CommandWhois::HandleRemote(const std::vector<std::string>& parameters,
 CmdResult CommandWhois::HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
 {
        User *dest;
-       int userindex = 0;
-       unsigned long idle = 0, signon = 0;
+       unsigned int userindex = 0;
+       unsigned long idle = 0;
+       time_t signon = 0;
 
        if (CommandParser::LoopCall(user, this, parameters, 0))
                return CMD_SUCCESS;