Move a bunch of optional module numerics to the module source file.

[user/henk/code/inspircd.git] / src / xline.cpp

diff --git a/src/xline.cpp b/src/xline.cpp
index f21b2b4fb5d4bc623a32d5cf3b611baf5652ca95..cb4f011c0fffa76f8c8caa90d01c474a2a93b34f 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -23,6 +23,7 @@
 
 #include "inspircd.h"
 #include "xline.h"
+#include "modules/stats.h"
 
 /** An XLineFactory specialized to generate GLine* pointers
  */
@@ -33,7 +34,7 @@ class GLineFactory : public XLineFactory
 
        /** Generate a GLine
         */
-       XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+       XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE
        {
                IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
                return new GLine(set_time, duration, source, reason, ih.first, ih.second);
@@ -49,7 +50,7 @@ class ELineFactory : public XLineFactory
 
        /** Generate an ELine
         */
-       XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+       XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE
        {
                IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
                return new ELine(set_time, duration, source, reason, ih.first, ih.second);
@@ -65,7 +66,7 @@ class KLineFactory : public XLineFactory
 
        /** Generate a KLine
         */
-        XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+        XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE
         {
                 IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask);
                 return new KLine(set_time, duration, source, reason, ih.first, ih.second);
@@ -81,7 +82,7 @@ class QLineFactory : public XLineFactory
 
        /** Generate a QLine
         */
-        XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+        XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE
         {
                 return new QLine(set_time, duration, source, reason, xline_specific_mask);
         }
@@ -96,7 +97,7 @@ class ZLineFactory : public XLineFactory
 
        /** Generate a ZLine
         */
-        XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
+        XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE
         {
                 return new ZLine(set_time, duration, source, reason, xline_specific_mask);
         }
@@ -588,10 +589,6 @@ void GLine::Apply(User* u)
 
 bool ELine::Matches(User *u)
 {
-       LocalUser* lu = IS_LOCAL(u);
-       if (lu && lu->exempt)
-               return false;
-
        if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
        {
                if (InspIRCd::MatchCIDR(u->GetRealHost(), this->hostmask, ascii_case_insensitive_map) ||