Use ServiceProvider for inter-module dependencies

[user/henk/code/inspircd.git] / src / modules / extra / m_regex_pcre.cpp

diff --git a/src/modules/extra/m_regex_pcre.cpp b/src/modules/extra/m_regex_pcre.cpp
index 9e8aff159c81467959b935c67b6f5c73897b78be..c286162e8e25808bb07f721377f8e82a25e1020b 100644 (file)
--- a/src/modules/extra/m_regex_pcre.cpp
+++ b/src/modules/extra/m_regex_pcre.cpp
@@ -67,35 +67,27 @@ public:
        }
 };
 
-class ModuleRegexPCRE : public Module
+class PCREFactory : public RegexFactory
 {
-public:
-       ModuleRegexPCRE()       {
-               ServerInstance->Modules->PublishInterface("RegularExpression", this);
-       }
-
-       virtual Version GetVersion()
+ public:
+       PCREFactory(Module* m) : RegexFactory(m, "regex/pcre") {}
+       Regex* Create(const std::string& expr)
        {
-               return Version("Regex Provider Module for PCRE", VF_COMMON | VF_VENDOR);
+               return new PCRERegex(expr);
        }
+};
 
-       virtual ~ModuleRegexPCRE()
-       {
-               ServerInstance->Modules->UnpublishInterface("RegularExpression", this);
+class ModuleRegexPCRE : public Module
+{
+public:
+       PCREFactory ref;
+       ModuleRegexPCRE() : ref(this) {
+               ServerInstance->Modules->AddService(ref);
        }
 
-       void OnRequest(Request& request)
+       Version GetVersion()
        {
-               if (strcmp("REGEX-NAME", request.id) == 0)
-               {
-                       static_cast<RegexNameRequest&>(request).result = "pcre";
-               }
-               else if (strcmp("REGEX", request.id) == 0)
-               {
-                       RegexFactoryRequest& rfr = (RegexFactoryRequest&)request;
-                       std::string rx = rfr.GetRegex();
-                       rfr.result = new PCRERegex(rx);
-               }
+               return Version("Regex Provider Module for PCRE", VF_OPTCOMMON | VF_VENDOR);
        }
 };