From 658db6bbe639159ee4def06408d793fb65b5d14d Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Sun, 20 Sep 2015 01:52:10 +0200
Subject: [PATCH] Make CMessage::ToString() use GetParams()

Avoids having the same loop in two places.

GetParams() was under consideration to be removed after the CMessage
porting work is done, but it's starting to look like it's here to stay.
There are cases, such as mode messages, where "get all params starting
from position N" is handy.
---
 src/Message.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/Message.cpp b/src/Message.cpp
index 85c5973a..b8e5410d 100644
--- a/src/Message.cpp
+++ b/src/Message.cpp
@@ -151,14 +151,11 @@ CString CMessage::ToString(unsigned int uFlags) const
 	}
 
 	// <params>
-	unsigned uParams = m_vsParams.size();
-	for (unsigned int uIdx = 0; uIdx < uParams; ++uIdx) {
-		const CString& sParam = m_vsParams[uIdx];
-		sMessage += " ";
-		if (uIdx == uParams - 1 && (m_bColon || sParam.empty() || sParam.StartsWith(":") || sParam.Contains(" "))) {
-			sMessage += ":";
+	if (!m_vsParams.empty()) {
+		if (!sMessage.empty()) {
+			sMessage += " ";
 		}
-		sMessage += sParam;
+		sMessage += GetParams(0);
 	}
 
 	return sMessage;