Remove more classbase

[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 b0d8f54b77ebcb185b8a892a20840b5aa3fcfaf8..c356a2154cc88470b1d75a3838a01b6973e41a6f 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -18,7 +18,7 @@
 
 /* $ModDesc: Implementation of callerid (umode +g & /accept, ala hybrid etc) */
 
-class callerid_data : public classbase
+class callerid_data
 {
  public:
        time_t lastnotify;
@@ -78,7 +78,7 @@ struct CallerIDExtInfo : public ExtensionItem
        {
        }
 
-       std::string serialize(SerializeFormat format, const Extensible* container, void* item)
+       std::string serialize(SerializeFormat format, const Extensible* container, void* item) const
        {
                callerid_data* dat = static_cast<callerid_data*>(item);
                return dat->ToString(format);
@@ -128,7 +128,7 @@ struct CallerIDExtInfo : public ExtensionItem
 class User_g : public SimpleUserModeHandler
 {
 public:
-       User_g(Module* Creator) : SimpleUserModeHandler(Creator, 'g') { }
+       User_g(Module* Creator) : SimpleUserModeHandler(Creator, "callerid", 'g') { }
 };
 
 class CommandAccept : public Command
@@ -350,7 +350,7 @@ public:
                        throw ModuleException("Could not add usermode +g");
 
                ServerInstance->AddCommand(&cmd);
-               Extensible::Register(&cmd.extInfo);
+               ServerInstance->Extensions.Register(&cmd.extInfo);
 
                Implementation eventlist[] = { I_OnRehash, I_OnUserPreNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage };
                ServerInstance->Modules->Attach(eventlist, this, 6);
@@ -358,12 +358,11 @@ public:
 
        virtual ~ModuleCallerID()
        {
-               ServerInstance->Modes->DelMode(&myumode);
        }
 
        virtual Version GetVersion()
        {
-               return Version("Implementation of callerid (umode +g & /accept, ala hybrid etc)", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Implementation of callerid (umode +g & /accept, ala hybrid etc)", VF_COMMON | VF_VENDOR);
        }
 
        virtual void On005Numeric(std::string& output)