More AddModes fixes

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

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 5dd406e54fbe5e395a2dcd7b494389bb074c602e..8bd53d62d2b64ed7199def1873fcc50c4d37dd36 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -12,10 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "mode.h"
 #include "u_listmode.h"
 #include "wildcard.h"
 
@@ -50,9 +46,9 @@ public:
        : Module(Me)
        {
                be = new BanException(ServerInstance);
-               if (!ServerInstance->AddMode(be, 'e'))
+               if (!ServerInstance->AddMode(be))
                        throw ModuleException("Could not add new modes!");
-               ServerInstance->PublishInterface("ChannelBanList", this);
+               ServerInstance->Modules->PublishInterface("ChannelBanList", this);
        }
        
        virtual void Implements(char* List)
@@ -66,7 +62,7 @@ public:
                output.append(" EXCEPTS=e");
        }
 
-       virtual int OnCheckBan(userrec* user, chanrec* chan)
+       virtual int OnCheckBan(User* user, Channel* chan)
        {
                if (chan != NULL)
                {
@@ -97,17 +93,17 @@ public:
                be->DoCleanup(target_type, item);
        }
 
-       virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+       virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
                be->DoSyncChannel(chan, proto, opaque);
        }
 
-       virtual void OnChannelDelete(chanrec* chan)
+       virtual void OnChannelDelete(Channel* chan)
        {
                be->DoChannelDelete(chan);
        }
 
-       virtual void OnRehash(userrec* user, const std::string &param)
+       virtual void OnRehash(User* user, const std::string &param)
        {
                be->DoRehash();
        }
@@ -145,31 +141,9 @@ public:
        virtual ~ModuleBanException()
        {
                ServerInstance->Modes->DelMode(be);
-               DELETE(be);
-               ServerInstance->UnpublishInterface("ChannelBanList", this);
+               delete be;
+               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
        }
 };
 
-class ModuleBanExceptionFactory : public ModuleFactory
-{
- public:
-       ModuleBanExceptionFactory()
-       {
-       }
-       
-       ~ModuleBanExceptionFactory()
-       {
-       }
-       
-       virtual Module* CreateModule(InspIRCd* Me)
-       {
-               return new ModuleBanException(Me);
-       }
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleBanExceptionFactory;
-}
-
+MODULE_INIT(ModuleBanException)