X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fchannels.h;h=1ded25a736fc0d8ca2bf799569a879987401ebfe;hb=74066e0f563ef630e432d3bbb10544318b70ade3;hp=416a34a502dd6fa1a7299ac575236f1d822250bb;hpb=2d732f4dbf4ccd22c8a4424692cc72a89ffd49b7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/channels.h b/include/channels.h
index 416a34a50..1ded25a73 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -83,7 +83,7 @@ class CoreExport Channel : public Extensible
 {
 	/** Connect a Channel to a User
 	 */
-	static Channel* ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting, bool created);
+	static Channel* ForceChan(Channel* Ptr, User* user, const std::string &privs, bool bursting, bool created);
 
 	/** Set default modes for the channel on creation
 	 */
@@ -97,7 +97,7 @@ class CoreExport Channel : public Extensible
 	/** Creates a channel record and initialises it with default values
 	 * @throw Nothing at present.
 	 */
-	Channel(InspIRCd* Instance, const std::string &name, time_t ts);
+	Channel(const std::string &name, time_t ts);
 
 	/** The channel's name.
 	 */
@@ -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);
+	long 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.
@@ -261,7 +261,7 @@ class CoreExport Channel : public Extensible
 	 * been created if the channel did not exist before the user was joined to it.
 	 * If the user could not be joined to a channel, the return value may be NULL.
 	 */
-	static Channel* JoinUser(InspIRCd* ServerInstance, User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS = 0);
+	static Channel* JoinUser(User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS = 0);
 
 	/** Write to a channel, from a user, using va_args for text
 	 * @param user User whos details to prefix the line with
@@ -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().