Delete modewatchers when unloading modules that use them to keep the server from...

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

diff --git a/src/modules/m_regex_glob.cpp b/src/modules/m_regex_glob.cpp
index 42cc0abd1d0d3e522f114f2871adfdbe4d0ce6a3..75d77a2674375703448688dd5077e8d0e2cbf69e 100644 (file)
--- 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);
        }
 };