Fix compilation of SQL modules, use GlobalCulls to clean up deleted modules

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

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index dab0d3d43c8afa732c9146d59d47d75bc35277b8..45d3f0e5ccddca52eb2d78b0fc89bd7ddb68ab9e 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -128,7 +128,7 @@ struct CallerIDExtInfo : public ExtensionItem
 class User_g : public SimpleUserModeHandler
 {
 public:
-       User_g(InspIRCd* Instance, Module* Creator) : SimpleUserModeHandler(Creator, 'g') { }
+       User_g(Module* Creator) : SimpleUserModeHandler(Creator, 'g') { }
 };
 
 class CommandAccept : public Command
@@ -136,7 +136,7 @@ class CommandAccept : public Command
 public:
        CallerIDExtInfo extInfo;
        unsigned int maxaccepts;
-       CommandAccept(InspIRCd* Instance, Module* Creator) : Command(Instance, Creator, "ACCEPT", 0, 1),
+       CommandAccept(Module* Creator) : Command(Creator, "ACCEPT", 1),
                extInfo(Creator)
        {
                syntax = "{[+|-]<nicks>}|*}";
@@ -342,7 +342,7 @@ private:
        }
 
 public:
-       ModuleCallerID(InspIRCd* Me) : Module(Me), cmd(Me, this), myumode(Me, this)
+       ModuleCallerID() : cmd(this), myumode(this)
        {
                OnRehash(NULL);
 
@@ -363,7 +363,7 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Implementation of callerid (umode +g & /accept, ala hybrid etc)", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
        virtual void On005Numeric(std::string& output)
@@ -429,7 +429,7 @@ public:
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader Conf(ServerInstance);
+               ConfigReader Conf;
                cmd.maxaccepts = Conf.ReadInteger("callerid", "maxaccepts", "16", 0, true);
                operoverride = Conf.ReadFlag("callerid", "operoverride", "0", 0);
                tracknick = Conf.ReadFlag("callerid", "tracknick", "0", 0);