1 files changed, 14 insertions, 29 deletions

diff --git a/src/modules/extra/m_regex_stdlib.cpp b/src/modules/extra/m_regex_stdlib.cpp
index 204728b65..5ec358d58 100644
--- a/src/modules/extra/m_regex_stdlib.cpp
+++ b/src/modules/extra/m_regex_stdlib.cpp
@@ -15,32 +15,18 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+
 #include "inspircd.h"
-#include "m_regex.h"
+#include "modules/regex.h"
 #include <regex>
 
-/* $ModDesc: Regex Provider Module for std::regex Regular Expressions */
-/* $ModConfig: <stdregex type="ecmascript">
- *  Specify the Regular Expression engine to use here. Valid settings are
- *  bre, ere, awk, grep, egrep, ecmascript (default if not specified)*/
 /* $CompileFlags: -std=c++11 */
-/* $ModDep: m_regex.h */
-
-class StdRegexException : public ModuleException
-{
-public:
-	StdRegexException(const std::string& rx, const std::string& error)
-		: ModuleException(std::string("Error in regex ") + rx + ": " + error)
-	{
-	}
-};
 
 class StdRegex : public Regex
 {
-private:
 	std::regex regexcl;
-public:
+
+ public:
 	StdRegex(const std::string& rx, std::regex::flag_type fltype) : Regex(rx)
 	{
 		try{
@@ -48,11 +34,11 @@ public:
 		}
 		catch(std::regex_error rxerr)
 		{
-			throw StdRegexException(rx, rxerr.what());
+			throw RegexException(rx, rxerr.what());
 		}
 	}
-	
-	virtual bool Matches(const std::string& text)
+
+	bool Matches(const std::string& text) CXX11_OVERRIDE
 	{
 		return std::regex_search(text, regexcl);
 	}
@@ -63,7 +49,7 @@ class StdRegexFactory : public RegexFactory
  public:
 	std::regex::flag_type regextype;
 	StdRegexFactory(Module* m) : RegexFactory(m, "regex/stdregex") {}
-	Regex* Create(const std::string& expr)
+	Regex* Create(const std::string& expr) CXX11_OVERRIDE
 	{
 		return new StdRegex(expr, regextype);
 	}
@@ -73,23 +59,22 @@ class ModuleRegexStd : public Module
 {
 public:
 	StdRegexFactory ref;
-	ModuleRegexStd() : ref(this) {
+	ModuleRegexStd() : ref(this)
+	{
 		ServerInstance->Modules->AddService(ref);
-		Implementation eventlist[] = { I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		OnRehash(NULL);
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Regex Provider Module for std::regex", VF_VENDOR);
 	}
-	
-	void OnRehash(User* u)
+
+	void OnRehash(User* u) CXX11_OVERRIDE
 	{
 		ConfigTag* Conf = ServerInstance->Config->ConfValue("stdregex");
 		std::string regextype = Conf->getString("type", "ecmascript");
-		
+
 		if(regextype == "bre")
 			ref.regextype = std::regex::basic;
 		else if(regextype == "ere")