Merge branch 'insp20' into master.

[user/henk/code/inspircd.git] / src / modules / m_helpop.cpp

diff --git a/src/modules/m_helpop.cpp b/src/modules/m_helpop.cpp
index 95f69774bb0cad6cc543f7aa964b1688ac361342..f8829857681b37b9a775ab2f35c6f9cac6e952ab 100644 (file)
--- a/src/modules/m_helpop.cpp
+++ b/src/modules/m_helpop.cpp
@@ -22,6 +22,13 @@
 
 
 #include "inspircd.h"
+#include "modules/whois.h"
+
+enum
+{
+       // From UnrealIRCd.
+       RPL_WHOISHELPOP = 310
+};
 
 typedef std::map<std::string, std::string, irc::insensitive_swo> HelpopMap;
 static HelpopMap helpop_map;
@@ -50,7 +57,7 @@ class CommandHelpop : public Command
                syntax = "<any-text>";
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                const std::string& parameter = (!parameters.empty() ? parameters[0] : startkey);
 
@@ -145,7 +152,7 @@ class ModuleHelpop : public Module, public Whois::EventListener
                {
                        if (whois.GetTarget()->IsModeSet(ho))
                        {
-                               whois.SendLine(310, "is available for help.");
+                               whois.SendLine(RPL_WHOISHELPOP, "is available for help.");
                        }
                }