Updates, should be able to safely unload client modules with queries in progress...

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

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index e08ba479c9feed5adba0bff124bbc3c6f86350c5..1fd3bde927dfcb496a9429bf34bf9bfdb36003b0 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -29,7 +29,7 @@ using namespace std;
 
 /* $ModDesc: An enhanced version of the unreal m_filter.so used by chatspike.net */
 
-class Filter
+class Filter : public classbase
 {
  public:
        std::string reason;
@@ -41,7 +41,7 @@ typedef std::map<std::string,Filter*> filter_t;
 class FilterException : public ModuleException
 {
  public:
-       virtual char* GetReason()
+       virtual const char* GetReason()
        {
                return "Could not find <filter file=\"\"> definition in your config file!";
        }
@@ -140,7 +140,7 @@ class ModuleFilter : public Module
                }
                for (filter_t::iterator n = filters.begin(); n != filters.end(); n++)
                {
-                       delete n->second;
+                       DELETE(n->second);
                }
                filters.clear();
                for (int index = 0; index < MyConf->Enumerate("keyword"); index++)
@@ -156,8 +156,8 @@ class ModuleFilter : public Module
                        filters[pattern] = x;
                }
                Srv->Log(DEFAULT,std::string("m_filter: read configuration from ")+filterfile);
-               delete Conf;
-               delete MyConf;
+               DELETE(Conf);
+               DELETE(MyConf);
        }
        
        virtual Version GetVersion()