Match conversion stuff.

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

diff --git a/src/modules/m_denychans.cpp b/src/modules/m_denychans.cpp
index 2717d873a90ca4e56adef6b9dd58521794e21185..45c9cbcd6a274929a1d713a763eb703e6c337646 100644 (file)
--- a/src/modules/m_denychans.cpp
+++ b/src/modules/m_denychans.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Implements config tags which allow blocking of joins to channels */
 
@@ -54,12 +53,12 @@ class ModuleDenyChannels : public Module
 
                                for (int j =0; j < Conf->Enumerate("badchan"); j++)
                                {
-                                       if (match(redirect, Conf->ReadValue("badchan","name",j)))
+                                       if (InspIRCd::Match(redirect, Conf->ReadValue("badchan","name",j)))
                                        {
                                                bool goodchan = false;
                                                for (int k =0; k < Conf->Enumerate("goodchan"); k++)
                                                {
-                                                       if (match(redirect, Conf->ReadValue("goodchan","name",k)))
+                                                       if (InspIRCd::Match(redirect, Conf->ReadValue("goodchan","name",k)))
                                                                goodchan = true;
                                                }
 
@@ -91,7 +90,7 @@ class ModuleDenyChannels : public Module
        {
                for (int j =0; j < Conf->Enumerate("badchan"); j++)
                {
-                       if (match(cname, Conf->ReadValue("badchan","name",j)))
+                       if (InspIRCd::Match(cname, Conf->ReadValue("badchan","name",j)))
                        {
                                if (IS_OPER(user) && Conf->ReadFlag("badchan","allowopers",j))
                                {
@@ -104,7 +103,7 @@ class ModuleDenyChannels : public Module
 
                                        for (int i = 0; i < Conf->Enumerate("goodchan"); i++)
                                        {
-                                               if (match(cname, Conf->ReadValue("goodchan", "name", i)))
+                                               if (InspIRCd::Match(cname, Conf->ReadValue("goodchan", "name", i)))
                                                {
                                                        return 0;
                                                }