Remove dummy API_VERSION from Version constructor

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

diff --git a/src/modules/extra/m_regex_tre.cpp b/src/modules/extra/m_regex_tre.cpp
index 1ed35605b7d2d11efd5fe76dc5d403b99cad40d1..ef0ed91a4746a0f05e3670072f9ba6581e68978a 100644 (file)
--- 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, ) : Regex(rx, Me)
+       TRERegex(const std::string& rx) : Regex(rx)
        {
                int flags = REG_EXTENDED | REG_NOSUB;
                int errcode;
@@ -78,13 +78,11 @@ class ModuleRegexTRE : public Module
 public:
        ModuleRegexTRE()        {
                ServerInstance->Modules->PublishInterface("RegularExpression", this);
-               Implementation eventlist[] = { I_OnRequest };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
        virtual Version GetVersion()
        {
-               return Version("Regex Provider Module for TRE Regular Expressions", 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()
@@ -92,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;
        }
 };