Convert channel::name to std::string, this was a beastie!

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9770 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 8 insertions, 8 deletions

diff --git a/include/channels.h b/include/channels.h
index b404e26cd..7f1be6c5a 100644
--- a/include/channels.h
+++ b/include/channels.h
@@ -134,7 +134,7 @@ class CoreExport Channel : public Extensible
 
 	/** The channel's name.
 	 */
-	char name[CHANMAX];
+	std::string name; /* CHANMAX */
 
 	/** Modes for the channel.
 	 * This is not a null terminated string! It is a hash where
@@ -180,7 +180,7 @@ class CoreExport Channel : public Extensible
 	/** Channel topic.
 	 * If this is an empty string, no channel topic is set.
 	 */
-	char topic[MAXTOPIC];
+	std::string topic; /* MAXTOPIC */
 
 	/** Creation time.
 	 * This is a timestamp (TS) value.
@@ -195,7 +195,7 @@ class CoreExport Channel : public Extensible
 	/** The last user to set the topic.
 	 * If this member is an empty string, no topic was ever set.
 	 */
-	char setby[128];
+	std::string setby; /* 128 */
 
 	/** Contains the channel user limit.
 	 * If this value is zero, there is no limit in place.
@@ -205,7 +205,7 @@ class CoreExport Channel : public Extensible
 	/** Contains the channel key.
 	 * If this value is an empty string, there is no channel key in place.
 	 */
-	char key[32];
+	std::string key; /* 32 */
 
 	/** The list of all bans set on the channel.
 	 */
diff --git a/include/u_listmode.h b/include/u_listmode.h
index a7df014ed..5d1607b5c 100644
--- a/include/u_listmode.h
+++ b/include/u_listmode.h
@@ -153,15 +153,15 @@ class ListModeBase : public ModeHandler
 		{
 			for (modelist::reverse_iterator it = el->rbegin(); it != el->rend(); ++it)
 			{
-				user->WriteNumeric(listnumeric, "%s %s %s %s %s", user->nick.c_str(), channel->name, it->mask.c_str(), it->nick.c_str(), it->time.c_str());
+				user->WriteNumeric(listnumeric, "%s %s %s %s %s", user->nick.c_str(), channel->name.c_str(), it->mask.c_str(), it->nick.c_str(), it->time.c_str());
 			}
 		}
-		user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name, endofliststring.c_str());
+		user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name.c_str(), endofliststring.c_str());
 	}
 
 	virtual void DisplayEmptyList(User* user, Channel* channel)
 	{
-		user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name, endofliststring.c_str());
+		user->WriteNumeric(endoflistnumeric, "%s %s :%s", user->nick.c_str(), channel->name.c_str(), endofliststring.c_str());
 	}
 
 	/** Remove all instances of the mode from a channel.
@@ -323,7 +323,7 @@ class ListModeBase : public ModeHandler
 			/* List is full, give subclass a chance to send a custom message */
 			if (!TellListTooLong(source, channel, parameter))
 			{
-				source->WriteNumeric(478, "%s %s %s :Channel ban/ignore list is full", source->nick.c_str(), channel->name, parameter.c_str());
+				source->WriteNumeric(478, "%s %s %s :Channel ban/ignore list is full", source->nick.c_str(), channel->name.c_str(), parameter.c_str());
 			}
 			
 			parameter = "";