Move command-line items to CommandLineConf

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

diff --git a/include/channels.h b/include/channels.h
index ec09cbbca237d2bdbf022cd2761e856e9654544c..2915ed390573a35b395ad846d73b36f54b4981fc 100644 (file)
--- a/include/channels.h
+++ b/include/channels.h
@@ -36,7 +36,7 @@ struct ModResult;
 /** Holds an entry for a ban list, exemption list, or invite list.
  * This class contains a single element in a channel list, such as a banlist.
  */
-class HostItem : public classbase
+class HostItem
 {
  public:
        /** Time the item was added
@@ -204,7 +204,7 @@ class CoreExport Channel : public Extensible
         * @param user The user to delete
         * @return number of users left on the channel after deletion of the user
         */
-       unsigned long DelUser(User* user);
+       void DelUser(User* user);
 
        /** Obtain the internal reference list
         * The internal reference list contains a list of User*.
@@ -232,7 +232,7 @@ class CoreExport Channel : public Extensible
         * @return The number of users left on the channel. If this is zero
         * when the method returns, you MUST delete the Channel immediately!
         */
-       long KickUser(User *src, User *user, const char* reason);
+       void KickUser(User *src, User *user, const char* reason);
 
        /** Make the server kick user from this channel with the given reason.
         * @param user The user being kicked (must be on this channel)
@@ -241,7 +241,7 @@ class CoreExport Channel : public Extensible
         * @return The number of users left on the channel. If this is zero
         * when the method returns, you MUST delete the Channel immediately!
         */
-       long ServerKickUser(User* user, const char* reason, const char* servername = NULL);
+       void ServerKickUser(User* user, const char* reason, const std::string& servername = "");
 
        /** Part a user from this channel with the given reason.
         * If the reason field is NULL, no reason will be sent.
@@ -250,7 +250,7 @@ class CoreExport Channel : public Extensible
         * @return The number of users left on the channel. If this is zero
         * when the method returns, you MUST delete the Channel immediately!
         */
-       long PartUser(User *user, std::string &reason);
+       void PartUser(User *user, std::string &reason);
 
        /* Join a user to a channel. May be a channel that doesnt exist yet.
         * @param user The user to join to the channel.
@@ -281,13 +281,13 @@ class CoreExport Channel : public Extensible
         * @param text A printf-style format string which builds the output line without prefix
         * @param ... Zero or more POD type
         */
-       void WriteChannelWithServ(const char* ServName, const char* text, ...) CUSTOM_PRINTF(3, 4);
+       void WriteChannelWithServ(const std::string& ServName, const char* text, ...) CUSTOM_PRINTF(3, 4);
 
        /** Write to a channel, from a server, using std::string for text
         * @param ServName Server name to prefix the line with
         * @param text A std::string containing the output line without prefix
         */
-       void WriteChannelWithServ(const char* ServName, const std::string &text);
+       void WriteChannelWithServ(const std::string& ServName, const std::string &text);
 
        /** Write to all users on a channel except a specific user, using va_args for text.
         * Internally, this calls WriteAllExcept().