More craq

[user/henk/code/inspircd.git] / include / u_listmode.h

diff --git a/include/u_listmode.h b/include/u_listmode.h
index 6b4fba8893b800547d0e8cff9f6494964c223d25..dddd799ee03ddc6b1686d85cc48b7e0a97c43463 100644 (file)
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -18,11 +18,9 @@
 #include <string>
 #include <sstream>
 #include <vector>
-#include "users.h"
-#include "channels.h"
+#include "inspircd.h"
 #include "modules.h"
 #include "wildcard.h"
-#include "inspircd.h"
 
 /** Get the time as a string
  */
@@ -64,8 +62,8 @@ typedef std::vector<ListLimit> limitlist;
 class ListModeRequest : public Request
 {
  public:
-       userrec* user;
-       chanrec* chan;
+       User* user;
+       Channel* chan;
 
        /** Check if a user is on a channel's list.
         * The Event::Send() event returns true if the user is on the channel's list.
@@ -74,7 +72,7 @@ class ListModeRequest : public Request
         * @param u User to check against
         * @param c Channel to check against
         */
-       ListModeRequest(Module* sender, Module* target, userrec* u, chanrec* c) : Request(sender, target, "LM_CHECKLIST"), user(u), chan(c)
+       ListModeRequest(Module* sender, Module* target, User* u, Channel* c) : Request(sender, target, "LM_CHECKLIST"), user(u), chan(c)
        {
        }
 
@@ -132,7 +130,7 @@ class ListModeBase : public ModeHandler
 
        /** See mode.h 
         */
-       std::pair<bool,std::string> ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+       std::pair<bool,std::string> ModeSet(User*, User*, Channel* channel, const std::string &parameter)
        {
                modelist* el;
                channel->GetExt(infokey, el);
@@ -153,7 +151,7 @@ class ListModeBase : public ModeHandler
         * @param user The user to send the list to
         * @param channel The channel the user is requesting the list for
         */
-       virtual void DisplayList(userrec* user, chanrec* channel)
+       virtual void DisplayList(User* user, Channel* channel)
        {
                modelist* el;
                channel->GetExt(infokey, el);
@@ -167,7 +165,7 @@ class ListModeBase : public ModeHandler
                user->WriteServ("%s %s %s :%s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
        }
 
-       virtual void DisplayEmptyList(userrec* user, chanrec* channel)
+       virtual void DisplayEmptyList(User* user, Channel* channel)
        {
                user->WriteServ("%s %s %s :%s", endoflistnumeric.c_str(), user->nick, channel->name, endofliststring.c_str());
        }
@@ -176,7 +174,7 @@ class ListModeBase : public ModeHandler
         * See mode.h
         * @param channel The channel to remove all instances of the mode from
         */
-       virtual void RemoveMode(chanrec* channel)
+       virtual void RemoveMode(Channel* channel)
        {
                modelist* el;
                channel->GetExt(infokey, el);
@@ -206,7 +204,7 @@ class ListModeBase : public ModeHandler
 
        /** See mode.h
         */
-       virtual void RemoveMode(userrec* user)
+       virtual void RemoveMode(User*)
        {
                /* Listmodes dont get set on users */
        }
@@ -248,7 +246,7 @@ class ListModeBase : public ModeHandler
        /** Handle the list mode.
         * See mode.h
         */
-       virtual ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       virtual ModeAction OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
        {
                // Try and grab the list
                modelist* el;
@@ -375,7 +373,7 @@ class ListModeBase : public ModeHandler
         * See modules.h.
         * @param chan Channel being deleted
         */
-       virtual void DoChannelDelete(chanrec* chan)
+       virtual void DoChannelDelete(Channel* chan)
        {
                modelist* list;
                chan->GetExt(infokey, list);
@@ -393,7 +391,7 @@ class ListModeBase : public ModeHandler
         * @param proto Protocol module pointer
         * @param opaque Opaque connection handle
         */
-       virtual void DoSyncChannel(chanrec* chan, Module* proto, void* opaque)
+       virtual void DoSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
                modelist* list;
                chan->GetExt(infokey, list);
@@ -418,7 +416,7 @@ class ListModeBase : public ModeHandler
         * @param target_type Type of target to clean
         * @param item Item to clean
         */
-       virtual void DoCleanup(int target_type, void* item)
+       virtual void DoCleanup(int, void*)
        {
        }
        
@@ -429,7 +427,7 @@ class ListModeBase : public ModeHandler
         * @param parameter The actual parameter being added
         * @return true if the parameter is valid
         */
-       virtual bool ValidateParam(userrec* source, chanrec* channel, std::string &parameter)
+       virtual bool ValidateParam(User*, Channel*, std::string&)
        {
                return true;
        }
@@ -441,7 +439,7 @@ class ListModeBase : public ModeHandler
         * @param parameter The actual parameter being added
         * @return Ignored
         */
-       virtual bool TellListTooLong(userrec* source, chanrec* channel, std::string &parameter)
+       virtual bool TellListTooLong(User*, Channel*, std::string&)
        {
                return false;
        }
@@ -452,7 +450,7 @@ class ListModeBase : public ModeHandler
         * @param channel Channel the parameter is being added to
         * @param parameter The actual parameter being added
         */
-       virtual void TellAlreadyOnList(userrec* source, chanrec* channel, std::string &parameter)
+       virtual void TellAlreadyOnList(User*, Channel*, std::string&)
        {
        }
        
@@ -462,7 +460,7 @@ class ListModeBase : public ModeHandler
         * @param channel Channel the parameter is being removed from
         * @param parameter The actual parameter being removed
         */
-       virtual void TellNotSet(userrec* source, chanrec* channel, std::string &parameter)
+       virtual void TellNotSet(User*, Channel*, std::string&)
        {
        }
 };