Pedantic clean

[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 774c50b70047790308628afcf00ab2f67d34c6ea..d1fa5162a4b958716cb4af30274ba80c0155900d 100644 (file)
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include <stdarg.h>
 
 /* $ModDesc: Allows for opered clients to join channels without being seen, similar to unreal 3.1 +I mode */
@@ -32,7 +29,7 @@ class QuietOper : public VisData
        {
        }
 
-       virtual bool VisibleTo(userrec* user)
+       virtual bool VisibleTo(User* user)
        {
                return IS_OPER(user);
        }
@@ -56,7 +53,7 @@ class InvisibleMode : public ModeHandler
                delete qo;
        }
 
-       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 (source != dest)
                        return MODEACTION_DENY;
@@ -84,7 +81,7 @@ class InvisibleMode : public ModeHandler
                        dest->SetMode('Q', adding);
 
                        /* Fix for bug #379 reported by stealth. On +/-Q make m_watch think the user has signed on/off */
-                       Module* m = ServerInstance->FindModule("m_watch.so");
+                       Module* m = ServerInstance->Modules->Find("m_watch.so");
 
                        /* This must come before setting/unsetting the handler */
                        if (m && adding)
@@ -138,7 +135,7 @@ class InvisibleDeOper : public ModeWatcher
        {
        }
 
-       bool BeforeMode(userrec* source, userrec* dest, chanrec* channel, std::string &param, bool adding, ModeType type)
+       bool BeforeMode(User* source, User* dest, Channel* channel, std::string &param, bool adding, ModeType type)
        {
                /* Users who are opers and have +Q get their +Q removed when they deoper */
                if ((!adding) && (dest->IsModeSet('Q')))
@@ -162,7 +159,7 @@ class ModuleInvisible : public Module
        {
                conf = new ConfigReader(ServerInstance);
                qm = new InvisibleMode(ServerInstance);
-               if (!ServerInstance->AddMode(qm, 'Q'))
+               if (!ServerInstance->AddMode(qm))
                        throw ModuleException("Could not add new modes!");
                ido = new InvisibleDeOper(ServerInstance);
                if (!ServerInstance->AddModeWatcher(ido))
@@ -191,7 +188,7 @@ class ModuleInvisible : public Module
                List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = List[I_OnRehash] = 1;
        }
        
-       virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+       virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
        {
                if (user->IsModeSet('Q'))
                {
@@ -202,13 +199,13 @@ class ModuleInvisible : public Module
                }
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                DELETE(conf);
                conf = new ConfigReader(ServerInstance);
        }
 
-       void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent)
+       void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
        {
                if (user->IsModeSet('Q'))
                {
@@ -220,11 +217,11 @@ class ModuleInvisible : public Module
                }
        }
 
-       void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+       void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
        {
                if (user->IsModeSet('Q'))
                {
-                       command_t* parthandler = ServerInstance->Parser->GetHandler("PART");
+                       Command* parthandler = ServerInstance->Parser->GetHandler("PART");
                        std::vector<std::string> to_leave;
                        const char* parameters[2];
                        if (parthandler)
@@ -243,11 +240,11 @@ class ModuleInvisible : public Module
        }
 
        /* No privmsg response when hiding - submitted by Eric at neowin */
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
                {
-                       userrec* target = (userrec*)dest;
+                       User* target = (User*)dest;
                        if(target->IsModeSet('Q') && !*user->oper)
                        {
                                user->WriteServ("401 %s %s :No such nick/channel",user->nick, target->nick);
@@ -257,13 +254,13 @@ class ModuleInvisible : public Module
                return 0;
        }
        
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
        }
 
        /* Fix by Eric @ neowin.net, thanks :) -- Brain */
-       void WriteCommonFrom(userrec *user, chanrec* channel, const char* text, ...)
+       void WriteCommonFrom(User *user, Channel* channel, const char* text, ...)
        {
                va_list argsPtr;
                char textbuffer[MAXBUF];