Merge branch 'insp20' into master.

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

diff --git a/src/coremods/core_who.cpp b/src/coremods/core_who.cpp
index 305733e03e90694bb2397a27a9c91b96b82166b2..362e79c03c8e540df8170e0609d9f616790c0c20 100644 (file)
--- a/src/coremods/core_who.cpp
+++ b/src/coremods/core_who.cpp
@@ -56,7 +56,7 @@ struct WhoData
        // A user specified label for the WHOX response.
        std::string whox_querytype;
 
-       WhoData(const std::vector<std::string>& parameters)
+       WhoData(const CommandBase::Params& parameters)
                : whox(false)
        {
                // Find the matchtext and swap the 0 for a * so we can use InspIRCd::Match on it.
@@ -168,7 +168,7 @@ class CommandWho : public SplitCommand
        /** Sends a WHO reply to a user. */
        void SendWhoLine(LocalUser* user, const std::vector<std::string>& parameters, Membership* memb, User* u, WhoData& data);
 
-       CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user) CXX11_OVERRIDE;
+       CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE;
 };
 
 template<> User* CommandWho::GetUser(UserManager::OperList::const_iterator& t) { return *t; }
@@ -304,7 +304,7 @@ bool CommandWho::MatchUser(LocalUser* source, User* user, WhoData& data)
 
        // The source wants to match against users' real names.
        else if (data.flags['r'])
-               match = InspIRCd::Match(user->fullname, data.matchtext, ascii_case_insensitive_map);
+               match = InspIRCd::Match(user->GetRealName(), data.matchtext, ascii_case_insensitive_map);
 
        else if (data.flags['s'])
        {
@@ -340,7 +340,7 @@ bool CommandWho::MatchUser(LocalUser* source, User* user, WhoData& data)
                }
 
                if (!match)
-                       match = InspIRCd::Match(user->fullname, data.matchtext, ascii_case_insensitive_map);
+                       match = InspIRCd::Match(user->GetRealName(), data.matchtext, ascii_case_insensitive_map);
 
                if (!match)
                        match = InspIRCd::Match(user->nick, data.matchtext);
@@ -484,7 +484,7 @@ void CommandWho::SendWhoLine(LocalUser* source, const std::vector<std::string>&
 
                // Include the user's real name.
                if (data.whox_fields['r'])
-                       wholine.push(user->fullname);
+                       wholine.push(user->GetRealName());
        }
        else
        {
@@ -530,7 +530,7 @@ void CommandWho::SendWhoLine(LocalUser* source, const std::vector<std::string>&
 
                // Include the number of hops between the users and the user's real name.
                wholine.push("0 ");
-               wholine.GetParams().back().append(user->fullname);
+               wholine.GetParams().back().append(user->GetRealName());
        }
 
        ModResult res;
@@ -539,7 +539,7 @@ void CommandWho::SendWhoLine(LocalUser* source, const std::vector<std::string>&
                data.results.push_back(wholine);
 }
 
-CmdResult CommandWho::HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
+CmdResult CommandWho::HandleLocal(LocalUser* user, const Params& parameters)
 {
        WhoData data(parameters);