X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_regex_tre.cpp;h=8a1d5424880d6d479ea9286494a2a0ec921f5433;hb=fb66fb5ce3410d7e32813aed85e8ad3050584740;hp=86efac016cb62219273721f356424041cf982768;hpb=fd0fa86da89ab4cefa778307088ef2552a05a170;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp
index 86efac016..8a1d54248 100644
--- a/src/modules/extra/m_regex_tre.cpp
+++ b/src/modules/extra/m_regex_tre.cpp
@@ -25,16 +25,6 @@
 
 /* $CompileFlags: pkgconfincludes("tre","tre/regex.h","") */
 /* $LinkerFlags: pkgconflibs("tre","/libtre.so","-ltre") rpath("pkg-config --libs tre") */
-/* $ModDep: modules/regex.h */
-
-class TRERegexException : public ModuleException
-{
- public:
-	TRERegexException(const std::string& rx, const std::string& error)
-		: ModuleException("Error in regex " + rx + ": " + error)
-	{
-	}
-};
 
 class TRERegex : public Regex
 {
@@ -58,7 +48,7 @@ public:
 			error = errbuf;
 			delete[] errbuf;
 			regfree(&regbuf);
-			throw TRERegexException(rx, error);
+			throw RegexException(rx, error);
 		}
 	}
 
@@ -67,14 +57,9 @@ public:
 		regfree(&regbuf);
 	}
 
-	bool Matches(const std::string& text)
+	bool Matches(const std::string& text)  CXX11_OVERRIDE
 	{
-		if (regexec(&regbuf, text.c_str(), 0, NULL, 0) == 0)
-		{
-			// Bang. :D
-			return true;
-		}
-		return false;
+		return (regexec(&regbuf, text.c_str(), 0, NULL, 0) == 0);
 	}
 };
 
@@ -82,7 +67,7 @@ class TREFactory : public RegexFactory
 {
  public:
 	TREFactory(Module* m) : RegexFactory(m, "regex/tre") {}
-	Regex* Create(const std::string& expr)
+	Regex* Create(const std::string& expr) CXX11_OVERRIDE
 	{
 		return new TRERegex(expr);
 	}
@@ -95,7 +80,6 @@ class ModuleRegexTRE : public Module
  public:
 	ModuleRegexTRE() : trf(this)
 	{
-		ServerInstance->Modules->AddService(trf);
 	}
 
 	Version GetVersion() CXX11_OVERRIDE