Some more text fixes and improvements (#1618).

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

diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index a3088cabd6227c6187e317c2a25409e659a7bc5f..f4dccac20a5b3f25d57e8a05499331487a6db320 100644 (file)
--- a/src/modules/m_regex_glob.cpp
+++ b/src/modules/m_regex_glob.cpp
@@ -18,11 +18,9 @@
  */
 
 
-#include "m_regex.h"
+#include "modules/regex.h"
 #include "inspircd.h"
 
-/* $ModDesc: Regex module using plain wildcard matching. */
-
 class GlobRegex : public Regex
 {
 public:
@@ -30,7 +28,7 @@ public:
        {
        }
 
-       virtual bool Matches(const std::string& text)
+       bool Matches(const std::string& text) CXX11_OVERRIDE
        {
                return InspIRCd::Match(text, this->regex_string);
        }
@@ -39,7 +37,7 @@ public:
 class GlobFactory : public RegexFactory
 {
  public:
-       Regex* Create(const std::string& expr)
+       Regex* Create(const std::string& expr) CXX11_OVERRIDE
        {
                return new GlobRegex(expr);
        }
@@ -51,13 +49,14 @@ class ModuleRegexGlob : public Module
 {
        GlobFactory gf;
 public:
-       ModuleRegexGlob() : gf(this) {
-               ServerInstance->Modules->AddService(gf);
+       ModuleRegexGlob()
+               : gf(this)
+       {
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Regex module using plain wildcard matching.", VF_VENDOR);
+               return Version("Regex provider module using plain wildcard matching", VF_VENDOR);
        }
 };