X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_regex.h;h=523f9f0d32f4bbce6ca44a65feba28a0cb916a61;hb=1bfa48143c04504181d1b194af151fae2dac1eb1;hp=b10a5115b8cab3b6f7ee14a541b09167239b4b3a;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_regex.h b/src/modules/m_regex.h
index b10a5115b..523f9f0d3 100644
--- a/src/modules/m_regex.h
+++ b/src/modules/m_regex.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,10 +20,9 @@ class Regex : public classbase
 {
 protected:
 	std::string regex_string; // The raw uncompiled regex string.
-	InspIRCd* ServerInstance;
 
 	// Constructor may as well be protected, as this class is abstract.
-	Regex(const std::string& rx, InspIRCd* Me) : regex_string(rx), ServerInstance(Me)
+	Regex(const std::string& rx) : regex_string(rx)
 	{
 	}
 
@@ -41,36 +40,12 @@ public:
 	}
 };
 
-class RegexFactoryRequest : public Request
+class RegexFactory : public DataProvider
 {
-private:
-	std::string regex;
+ public:
+	RegexFactory(Module* Creator, const std::string& Name) : DataProvider(Creator, Name) {}
 
-public:
-	Regex* result;
-
-	RegexFactoryRequest(Module* Me, Module* Target, const std::string& rx) : Request(Me, Target, "REGEX"), regex(rx), result(NULL)
-	{
-	}
-
-	const std::string& GetRegex() const
-	{
-		return regex;
-	}
-
-	Regex* Create()
-	{
-		Send();
-		return this->result;
-	}
-};
-
-class RegexNameRequest : public Request
-{
-public:
-	RegexNameRequest(Module* Me, Module* Target) : Request(Me, Target, "REGEX-NAME")
-	{
-	}
+	virtual Regex* Create(const std::string& expr) = 0;
 };
 
 #endif