Merge branch 'insp20' into master.

[user/henk/code/inspircd.git] / include / xline.h

diff --git a/include/xline.h b/include/xline.h
index fe044d0f2d07b7ef119606dc0d7fd8464e979473..9aae32b24b044068a33e5b8deb7c4de683531a06 100644 (file)
--- a/include/xline.h
+++ b/include/xline.h
@@ -170,15 +170,15 @@ class CoreExport KLine : public XLine
        {
        }
 
-       virtual bool Matches(User *u);
+       bool Matches(User* u) CXX11_OVERRIDE;
 
-       virtual bool Matches(const std::string &str);
+       bool Matches(const std::string& str) CXX11_OVERRIDE;
 
-       virtual void Apply(User* u);
+       void Apply(User* u) CXX11_OVERRIDE;
 
-       virtual const std::string& Displayable();
+       const std::string& Displayable() CXX11_OVERRIDE;
 
-       virtual bool IsBurstable();
+       bool IsBurstable() CXX11_OVERRIDE;
 
        /** Ident mask (ident part only)
         */
@@ -216,13 +216,13 @@ class CoreExport GLine : public XLine
        {
        }
 
-       virtual bool Matches(User *u);
+       bool Matches(User* u) CXX11_OVERRIDE;
 
-       virtual bool Matches(const std::string &str);
+       bool Matches(const std::string& str) CXX11_OVERRIDE;
 
-       virtual void Apply(User* u);
+       void Apply(User* u)  CXX11_OVERRIDE;
 
-       virtual const std::string& Displayable();
+       const std::string& Displayable() CXX11_OVERRIDE;
 
        /** Ident mask (ident part only)
         */
@@ -258,15 +258,15 @@ class CoreExport ELine : public XLine
        {
        }
 
-       virtual bool Matches(User *u);
+       bool Matches(User* u) CXX11_OVERRIDE;
 
-       virtual bool Matches(const std::string &str);
+       bool Matches(const std::string& str) CXX11_OVERRIDE;
 
-       virtual void Unset();
+       void Unset() CXX11_OVERRIDE;
 
-       virtual void OnAdd();
+       void OnAdd() CXX11_OVERRIDE;
 
-       virtual const std::string& Displayable();
+       const std::string& Displayable() CXX11_OVERRIDE;
 
        /** Ident mask (ident part only)
         */
@@ -301,13 +301,13 @@ class CoreExport ZLine : public XLine
        {
        }
 
-       virtual bool Matches(User *u);
+       bool Matches(User* u) CXX11_OVERRIDE;
 
-       virtual bool Matches(const std::string &str);
+       bool Matches(const std::string& str) CXX11_OVERRIDE;
 
-       virtual void Apply(User* u);
+       void Apply(User* u) CXX11_OVERRIDE;
 
-       virtual const std::string& Displayable();
+       const std::string& Displayable() CXX11_OVERRIDE;
 
        /** IP mask (no ident part)
         */
@@ -336,13 +336,13 @@ class CoreExport QLine : public XLine
        ~QLine()
        {
        }
-       virtual bool Matches(User *u);
+       bool Matches(User* u) CXX11_OVERRIDE;
 
-       virtual bool Matches(const std::string &str);
+       bool Matches(const std::string& str) CXX11_OVERRIDE;
 
-       virtual void Apply(User* u);
+       void Apply(User* u) CXX11_OVERRIDE;
 
-       virtual const std::string& Displayable();
+       const std::string& Displayable() CXX11_OVERRIDE;
 
        /** Nickname mask
         */
@@ -520,8 +520,7 @@ class CoreExport XLineManager
         * will be expired and removed before the list is displayed.
         * @param type The type of stats to show
         * @param numeric The numeric to give to each result line
-        * @param user The username making the query
-        * @param results The string_list to receive the results
+        * @param stats Stats context
         */
-       void InvokeStats(const std::string &type, int numeric, User* user, string_list &results);
+       void InvokeStats(const std::string& type, unsigned int numeric, Stats::Context& stats);
 };