Commit patch from danieldg that makes a ton of stuff const-safe for latest warn-happy...

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

diff --git a/src/modules/m_noinvite.cpp b/src/modules/m_noinvite.cpp
index 0b4e1723b552f1f44b7db9eecbb4735449377906..cff191db061eb5b4b4c6dce90641ab5418ddff06 100644 (file)
--- a/src/modules/m_noinvite.cpp
+++ b/src/modules/m_noinvite.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +V */
@@ -23,7 +20,7 @@ class NoInvite : public ModeHandler
  public:
        NoInvite(InspIRCd* Instance) : ModeHandler(Instance, 'V', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -51,19 +48,17 @@ class ModuleNoInvite : public Module
        NoInvite *ni;
  public:
 
-       ModuleNoInvite(InspIRCd* Me) : Module::Module(Me)
+       ModuleNoInvite(InspIRCd* Me) : Module(Me)
        {
                ni = new NoInvite(ServerInstance);
-               if (!ServerInstance->AddMode(ni, 'V'))
+               if (!ServerInstance->Modes->AddMode(ni))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreInvite };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreInvite] = 1;
-       }
 
-       virtual int OnUserPreInvite(userrec* user,userrec* dest,chanrec* channel)
+       virtual int OnUserPreInvite(User* user,User* dest,Channel* channel, time_t timeout)
        {
                if (channel->IsModeSet('V'))
                {
@@ -76,7 +71,7 @@ class ModuleNoInvite : public Module
        virtual ~ModuleNoInvite()
        {
                ServerInstance->Modes->DelMode(ni);
-               DELETE(ni);
+               delete ni;
        }
        
        virtual Version GetVersion()
@@ -85,27 +80,4 @@ class ModuleNoInvite : public Module
        }
 };
 
-
-class ModuleNoInviteFactory : public ModuleFactory
-{
- public:
-       ModuleNoInviteFactory()
-       {
-       }
-
-       ~ModuleNoInviteFactory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleNoInvite(Me);
-       }
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleNoInviteFactory;
-}
-
+MODULE_INIT(ModuleNoInvite)