X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fextra%2Fm_regex_tre.cpp;h=ef0ed91a4746a0f05e3670072f9ba6581e68978a;hb=67a4a9b62355ea57a2f4521ca5fc53bd4eac3a1f;hp=085f15eb3dd70224f3a3d181bed522eaf58e55a5;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;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 085f15eb3..ef0ed91a4 100644
--- a/src/modules/extra/m_regex_tre.cpp
+++ b/src/modules/extra/m_regex_tre.cpp
@@ -36,7 +36,7 @@ private:
 	regex_t regbuf;
 
 public:
-	TRERegex(const std::string& rx, InspIRCd* Me) : Regex(rx, Me)
+	TRERegex(const std::string& rx) : Regex(rx)
 	{
 		int flags = REG_EXTENDED | REG_NOSUB;
 		int errcode;
@@ -76,16 +76,13 @@ public:
 class ModuleRegexTRE : public Module
 {
 public:
-	ModuleRegexTRE(InspIRCd* Me) : Module(Me)
-	{
-		Me->Modules->PublishInterface("RegularExpression", this);
-		Implementation eventlist[] = { I_OnRequest };
-		Me->Modules->Attach(eventlist, this, 1);
+	ModuleRegexTRE() 	{
+		ServerInstance->Modules->PublishInterface("RegularExpression", this);
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+		return Version("Regex Provider Module for TRE Regular Expressions", VF_COMMON | VF_VENDOR | VF_SERVICEPROVIDER);
 	}
 
 	virtual ~ModuleRegexTRE()
@@ -93,20 +90,18 @@ public:
 		ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
 	}
 
-	virtual const char* OnRequest(Request* request)
+	void OnRequest(Request& request)
 	{
-		if (strcmp("REGEX-NAME", request->GetId()) == 0)
+		if (strcmp("REGEX-NAME", request.id) == 0)
 		{
-			return "tre";
+			static_cast<RegexNameRequest&>(request).result = "tre";
 		}
-		else if (strcmp("REGEX", request->GetId()) == 0)
+		else if (strcmp("REGEX", request.id) == 0)
 		{
-			RegexFactoryRequest* rfr = (RegexFactoryRequest*)request;
-			std::string rx = rfr->GetRegex();
-			rfr->result = new TRERegex(rx, ServerInstance);
-			return "OK";
+			RegexFactoryRequest& rfr = (RegexFactoryRequest&)request;
+			std::string rx = rfr.GetRegex();
+			rfr.result = new TRERegex(rx);
 		}
-		return NULL;
 	}
 };