Use ServiceProvider for inter-module dependencies

This will stop dependency chains from preventing module reloads when
it is not actually needed; however, it removes some failsafes that will
need to be reimplemented in order to avoid unmapped vtables.

This deprecates Request as an inter-module signaling mechanism, although
SQL still uses it.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12140 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 15 insertions, 22 deletions

diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index 42cc0abd1..75d77a267 100644
--- a/src/modules/m_regex_glob.cpp
+++ b/src/modules/m_regex_glob.cpp
@@ -33,35 +33,28 @@ public:
 	}
 };
 
-class ModuleRegexGlob : public Module
+class GlobFactory : public RegexFactory
 {
-public:
-	ModuleRegexGlob() 	{
-		ServerInstance->Modules->PublishInterface("RegularExpression", this);
-	}
-
-	virtual Version GetVersion()
+ public:
+	Regex* Create(const std::string& expr)
 	{
-		return Version("Regex module using plain wildcard matching.", VF_OPTCOMMON | VF_VENDOR);
+		return new GlobRegex(expr);
 	}
 
-	virtual ~ModuleRegexGlob()
-	{
-		ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
+	GlobFactory(Module* m) : RegexFactory(m, "regex/glob") {}
+};
+
+class ModuleRegexGlob : public Module
+{
+	GlobFactory gf;
+public:
+	ModuleRegexGlob() : gf(this) {
+		ServerInstance->Modules->AddService(gf);
 	}
 
-	void OnRequest(Request& request)
+	Version GetVersion()
 	{
-		if (strcmp("REGEX-NAME", request.id) == 0)
-		{
-			static_cast<RegexNameRequest&>(request).result = "glob";
-		}
-		else if (strcmp("REGEX", request.id) == 0)
-		{
-			RegexFactoryRequest& rfr = (RegexFactoryRequest&)request;
-			std::string rx = rfr.GetRegex();
-			rfr.result = new GlobRegex(rx);
-		}
+		return Version("Regex module using plain wildcard matching.", VF_OPTCOMMON | VF_VENDOR);
 	}
 };