Run DelMode and DelModeWatcher in RemoveModule

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

diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp
index cbdfcc600da266442cfafa25fb10b561833ea9df..9c4a582783ff8072feba2bcfb88f189ffcb9ac69 100644 (file)
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -1,5 +1,5 @@
 /*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
+ *       | Inspire Internet Relay Chat Daemon
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
@@ -19,8 +19,9 @@
 class InvisibleMode : public ModeHandler
 {
  public:
-       InvisibleMode(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'Q', 0, 0, false, MODETYPE_USER, true)
+       InvisibleMode(Module* Creator) : ModeHandler(Creator, 'Q', PARAM_NONE, MODETYPE_USER)
        {
+               oper = true;
        }
 
        ~InvisibleMode()
@@ -52,7 +53,7 @@ class InvisibleMode : public ModeHandler
 
                                snprintf(tb,MAXBUF,":%s %s %s", dest->GetFullHost().c_str(), adding ? "PART" : "JOIN", (*f)->name.c_str());
                                std::string out = tb;
-                               std::string n = this->ServerInstance->Modes->ModeString(dest, (*f));
+                               std::string n = ServerInstance->Modes->ModeString(dest, (*f));
 
                                for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++)
                                {
@@ -79,7 +80,7 @@ class InvisibleMode : public ModeHandler
 class InvisibleDeOper : public ModeWatcher
 {
  public:
-       InvisibleDeOper(InspIRCd* Instance) : ModeWatcher(Instance, 'o', MODETYPE_USER)
+       InvisibleDeOper(Module* parent) : ModeWatcher(parent, 'o', MODETYPE_USER)
        {
        }
 
@@ -104,8 +105,7 @@ class ModuleInvisible : public Module
        InvisibleMode qm;
        InvisibleDeOper ido;
  public:
-       ModuleInvisible(InspIRCd* Me)
-               : Module(Me), qm(Me, this), ido(Me)
+       ModuleInvisible() : qm(this), ido(this)
        {
                if (!ServerInstance->Modes->AddMode(&qm))
                        throw ModuleException("Could not add new modes!");
@@ -123,8 +123,6 @@ class ModuleInvisible : public Module
 
        ~ModuleInvisible()
        {
-               ServerInstance->Modes->DelMode(&qm);
-               ServerInstance->Modes->DelModeWatcher(&ido);
        };
 
        Version GetVersion();