Merge branch 'insp20' into master.

[user/henk/code/inspircd.git] / src / coremods / core_xline / core_xline.h

diff --git a/src/coremods/core_xline/core_xline.h b/src/coremods/core_xline/core_xline.h
index 6101d79bfd7b3e23204901ba3765bb0e7771ebc6..11756c06b982d01ad2e2217112896b476997921f 100644 (file)
--- a/src/coremods/core_xline/core_xline.h
+++ b/src/coremods/core_xline/core_xline.h
@@ -34,11 +34,11 @@ class InsaneBan
        class Matcher : public MatcherBase
        {
         public:
-               long Run(const std::string& mask)
+               long Run(const std::string& mask) CXX11_OVERRIDE
                {
                        long matches = 0;
                        const T* c = static_cast<T*>(this);
-                       const user_hash& users = *ServerInstance->Users->clientlist;
+                       const user_hash& users = ServerInstance->Users->GetUsers();
                        for (user_hash::const_iterator i = users.begin(); i != users.end(); ++i)
                        {
                                if (c->Check(i->second, mask))
@@ -79,7 +79,7 @@ class CommandEline : 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 /GLINE.
@@ -96,7 +96,7 @@ class CommandGline : 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 /KLINE.
@@ -113,7 +113,7 @@ class CommandKline : 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 /QLINE.
@@ -133,11 +133,10 @@ class CommandQline : public Command
 
        /** Handle command.
         * @param parameters The parameters to the command
-        * @param pcnt The number of parameters passed to the 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 /ZLINE.
@@ -160,5 +159,5 @@ class CommandZline : 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;
 };