X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fchannels.h;h=92dd9a1a37120acd9d3eaed7c1b97e19799447df;hb=dd98d56cabcd08a3d5207454e002b187af98d28a;hp=0f947ac226a780f058bb898a21aaba601de8cd1c;hpb=b57c7f4e466f72fdd2ac3deca42caa1ea7748338;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/channels.h b/include/channels.h
index 0f947ac22..92dd9a1a3 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -93,9 +93,6 @@ enum UserChannelModes {
 	UCMODE_HOP	= 4	/* Halfopped user */
 };
 
-/* Forward declaration -- required */
-class InspIRCd;
-
 /** A stored prefix and its rank
  */
 typedef std::pair<char, unsigned int> prefixtype;
@@ -122,7 +119,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);
+	static Channel* ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting);
 
 	/** Set default modes for the channel on creation
 	 */
@@ -138,6 +135,11 @@ class CoreExport Channel : public Extensible
 	int maxbans;
 
  public:
+	/** Creates a channel record and initialises it with default values
+	 * @throw Nothing at present.
+	 */
+	Channel(InspIRCd* Instance, const std::string &name, time_t ts);
+
 	/** The channel's name.
 	 */
 	char name[CHANMAX];
@@ -334,11 +336,6 @@ class CoreExport Channel : public Extensible
 	 */
 	bool HasUser(User* user);
 
-	/** Creates a channel record and initialises it with default values
-	 * @throw Nothing at present.
-	 */
-	Channel(InspIRCd* Instance);
-
 	/** Make src kick user from this channel with the given reason.
 	 * @param src The source of the kick
 	 * @param user The user being kicked (must be on this channel)
@@ -375,7 +372,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, time_t TS = 0);
+	static Channel* JoinUser(InspIRCd* ServerInstance, 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