Merge v2.0.23 and v2.0.24 into master.

[user/henk/code/inspircd.git] / src / coremods / core_channel / core_channel.h

diff --git a/src/coremods/core_channel/core_channel.h b/src/coremods/core_channel/core_channel.h
index 755f876f6dd73953acdef6fcb22057817c7fd0c4..0dafde8cbcf278c001b5852a31482ec7ec94560e 100644 (file)
--- a/src/coremods/core_channel/core_channel.h
+++ b/src/coremods/core_channel/core_channel.h
@@ -26,14 +26,21 @@ namespace Topic
        void ShowTopic(LocalUser* user, Channel* chan);
 }
 
+namespace Invite
+{
+       class APIImpl;
+}
+
 /** Handle /INVITE.
  */
 class CommandInvite : public Command
 {
+       Invite::APIImpl& invapi;
+
  public:
        /** Constructor for invite.
         */
-       CommandInvite (Module* parent);
+       CommandInvite(Module* parent, Invite::APIImpl& invapiimpl);
 
        /** Handle command.
         * @param parameters The parameters to the command
@@ -83,7 +90,7 @@ class CommandTopic : public SplitCommand
 
 /** Handle /NAMES.
  */
-class CommandNames : public Command
+class CommandNames : public SplitCommand
 {
        ChanModeReference secretmode;
        ChanModeReference privatemode;
@@ -99,14 +106,14 @@ class CommandNames : public Command
         * @param user The user issuing the command
         * @return A value from CmdResult to indicate command success or failure.
         */
-       CmdResult Handle(const std::vector<std::string>& parameters, User *user);
+       CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user);
 
        /** Spool the NAMES list for a given channel to the given user
         * @param user User to spool the NAMES list to
         * @param chan Channel whose nicklist to send
         * @param show_invisible True to show invisible (+i) members to the user, false to omit them from the list
         */
-       void SendNames(User* user, Channel* chan, bool show_invisible);
+       void SendNames(LocalUser* user, Channel* chan, bool show_invisible);
 };
 
 /** Handle /KICK.