massive warning fix

5 files changed, 19 insertions, 19 deletions

diff --git a/plugins/IEView/src/ChatHTMLBuilder.cpp b/plugins/IEView/src/ChatHTMLBuilder.cpp
index 0c95589461..9e8b8cc5a7 100644
--- a/plugins/IEView/src/ChatHTMLBuilder.cpp
+++ b/plugins/IEView/src/ChatHTMLBuilder.cpp
@@ -239,7 +239,7 @@ void ChatHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event)
 			str.AppendFormat("<span class=\"timestamp\">%s </span>", timestampToString(eventData->time));

 

 		if ((dwData & IEEDD_GC_SHOW_NICK) && eventData->iType == IEED_GC_EVENT_MESSAGE)

-			str.AppendFormat("<span class=\"%s\">%s: </span>", isSent ? "nameOut" : "nameIn", szName);

+			str.AppendFormat("<span class=\"%s\">%s: </span>", isSent ? "nameOut" : "nameIn", szName.get());

 

 		if (dwData & IEEDD_GC_MSG_ON_NEW_LINE)

 			str.Append("<br>");

diff --git a/plugins/IEView/src/HistoryHTMLBuilder.cpp b/plugins/IEView/src/HistoryHTMLBuilder.cpp
index 11725edb12..e119e4c84a 100644
--- a/plugins/IEView/src/HistoryHTMLBuilder.cpp
+++ b/plugins/IEView/src/HistoryHTMLBuilder.cpp
@@ -258,12 +258,12 @@ void HistoryHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 			else

 				str.Append(" ");

 

-			str.AppendFormat("<span class=\"%s\">%s:</span>", isSent ? "nameOut" : "nameIn", szName);

+			str.AppendFormat("<span class=\"%s\">%s:</span>", isSent ? "nameOut" : "nameIn", szName.get());

 			str.AppendFormat("<span class=\"%s\">%s</span><br>", isSent ? "timeOut" : "timeIn", timestampToString(eventData->time));

 			if (eventData->iType == IEED_EVENT_FILE)

-				str.AppendFormat("%s:<br> %s", isSent ? Translate("Outgoing File Transfer") : Translate("Incoming File Transfer"), szText);

+				str.AppendFormat("%s:<br> %s", isSent ? Translate("Outgoing File Transfer") : Translate("Incoming File Transfer"), szText.get());

 			else

-				str.AppendFormat("%s", szText);

+				str.Append(szText);

 

 			str.Append("</div>\n");

 			setLastEventType(MAKELONG(eventData->dwFlags, eventData->iType));

diff --git a/plugins/IEView/src/MUCCHTMLBuilder.cpp b/plugins/IEView/src/MUCCHTMLBuilder.cpp
index c59be8a15d..f7885430c1 100644
--- a/plugins/IEView/src/MUCCHTMLBuilder.cpp
+++ b/plugins/IEView/src/MUCCHTMLBuilder.cpp
@@ -202,7 +202,7 @@ void MUCCHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event)
 				str.AppendFormat("<span class=\"%s\">%s </span>", isSent ? "timestamp" : "timestamp", timestampToString(dwData, eventData->time));

 

 			if (dwData & IEEDD_MUCC_SHOW_NICK)

-				str.AppendFormat("<span class=\"%s\">%s: </span>", isSent ? "nameOut" : "nameIn", szName);

+				str.AppendFormat("<span class=\"%s\">%s: </span>", isSent ? "nameOut" : "nameIn", szName.get());

 

 			if (dwData & IEEDD_MUCC_MSG_ON_NEW_LINE)

 				str.Append("<br>");

@@ -222,7 +222,7 @@ void MUCCHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event)
 				style.AppendFormat("font-style: %s;", eventData->fontStyle & IE_FONT_ITALIC ? "italic" : "normal");

 				style.AppendFormat("text-decoration: %s;", eventData->fontStyle & IE_FONT_UNDERLINE ? "underline" : "none");

 			}

-			str.AppendFormat("<span class=\"%s\"><span style=\"%s\">%s</span></span>", className, style.c_str(), szText);

+			str.AppendFormat("<span class=\"%s\"><span style=\"%s\">%s</span></span>", className, style.c_str(), szText.get());

 			str.Append("</div>\n");

 		}

 		else if (eventData->iType == IEED_MUCC_EVENT_JOINED || eventData->iType == IEED_MUCC_EVENT_LEFT || eventData->iType == IEED_MUCC_EVENT_TOPIC) {

@@ -250,7 +250,7 @@ void MUCCHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event)
 				str.AppendFormat("<span class=\"%s\">%s </span>", "timestamp", timestampToString(dwData, eventData->time));

 

 			str.AppendFormat("<span class=\"%s\">", className);

-			str.AppendFormat(Translate(eventText), szText);

+			str.AppendFormat(Translate(eventText), szText.get());

 			str.Append("</span>");

 			str.Append("</div>\n");

 		}

@@ -258,7 +258,7 @@ void MUCCHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event)
 			const char *className = "error";

 			szText = encodeUTF8(NULL, event->pszProto, eventData->pszText, ENF_NONE, isSent);

 			str.AppendFormat("<div class=\"%s\">", "divError");

-			str.AppendFormat("<span class=\"%s\"> %s: %s</span>", className, Translate("Error"), szText);

+			str.AppendFormat("<span class=\"%s\"> %s: %s</span>", className, Translate("Error"), szText.get());

 			str.Append("</div>\n");

 		}

 

diff --git a/plugins/IEView/src/ScriverHTMLBuilder.cpp b/plugins/IEView/src/ScriverHTMLBuilder.cpp
index 8157734247..bcb7096ba5 100644
--- a/plugins/IEView/src/ScriverHTMLBuilder.cpp
+++ b/plugins/IEView/src/ScriverHTMLBuilder.cpp
@@ -354,9 +354,9 @@ void ScriverHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 			if ((dwFlags & SMF_LOG_SHOWNICK && eventData->iType == IEED_EVENT_MESSAGE && isGroupBreak) || eventData->iType == IEED_EVENT_STATUSCHANGE) {

 				if (eventData->iType == IEED_EVENT_MESSAGE) {

 					if (showColon)

-						str.AppendFormat("<span class=\"%s\"> %s</span>", isSent ? "nameOut" : "nameIn", szName);

+						str.AppendFormat("<span class=\"%s\"> %s</span>", isSent ? "nameOut" : "nameIn", szName.get());

 					else

-						str.AppendFormat("<span class=\"%s\">%s</span>", isSent ? "nameOut" : "nameIn", szName);

+						str.AppendFormat("<span class=\"%s\">%s</span>", isSent ? "nameOut" : "nameIn", szName.get());

 

 					showColon = true;

 					if (dwFlags & SMF_LOG_GROUPMESSAGES) {

@@ -364,7 +364,7 @@ void ScriverHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 						showColon = false;

 					}

 				}

-				else str.AppendFormat("<span class=\"notices\">%s </span>", szName);

+				else str.AppendFormat("<span class=\"notices\">%s </span>", szName.get());

 			}

 			if (dwFlags & SMF_LOG_SHOWTIME && dwFlags & SMF_LOG_GROUPMESSAGES && dwFlags & SMF_LOG_MARKFOLLOWUPS

 				&& eventData->iType == IEED_EVENT_MESSAGE && isGroupBreak) {

@@ -384,9 +384,9 @@ void ScriverHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 

 			if (eventData->iType == IEED_EVENT_FILE) {

 				str.AppendFormat("<span class=\"%s\">%s: %s</span>", className, 

-					(isSent) ? Translate("File sent") : Translate("File received"), szText);

+					(isSent) ? Translate("File sent") : Translate("File received"), szText.get());

 			}

-			else str.AppendFormat("<span class=\"%s\">%s</span>", className, szText);

+			else str.AppendFormat("<span class=\"%s\">%s</span>", className, szText.get());

 

 			str.Append("</div>\n");

 			setLastEventType(MAKELONG(eventData->dwFlags, eventData->iType));

diff --git a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp
index d4910a93c9..1b51148521 100644
--- a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp
+++ b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp
@@ -352,9 +352,9 @@ void TabSRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 				else

 					className = isSent ? "hNameOut" : "hNameIn";

 				if (dwFlags & MWF_LOG_UNDERLINE)

-					str.AppendFormat("<span class=\"%s\"><u>%s%s</span>", className, szName, (dwFlags & MWF_LOG_SHOWTIME) ? " </u>" : "</u>: ");

+					str.AppendFormat("<span class=\"%s\"><u>%s%s</span>", className, szName.get(), (dwFlags & MWF_LOG_SHOWTIME) ? " </u>" : "</u>: ");

 				else

-					str.AppendFormat("<span class=\"%s\">%s%s</span>", className, szName, (dwFlags & MWF_LOG_SHOWTIME) ? " " : ": ");

+					str.AppendFormat("<span class=\"%s\">%s%s</span>", className, szName.get(), (dwFlags & MWF_LOG_SHOWTIME) ? " " : ": ");

 			}

 			if (dwFlags & MWF_LOG_SHOWTIME && (isGroupBreak || dwFlags2 & MWF_SHOW_MARKFOLLOWUPTS)) {

 				const char *className;

@@ -371,7 +371,7 @@ void TabSRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 			}

 			if ((eventData->iType == IEED_EVENT_STATUSCHANGE) || ((dwFlags & MWF_LOG_SHOWNICK) && !(dwFlags & MWF_LOG_SWAPNICK) && isGroupBreak)) {

 				if (eventData->iType == IEED_EVENT_STATUSCHANGE)

-					str.AppendFormat("<span class=\"statusChange\">%s </span>", szName);

+					str.AppendFormat("<span class=\"statusChange\">%s </span>", szName.get());

 				else {

 					const char *className = "";

 					if (!isHistory)

@@ -379,9 +379,9 @@ void TabSRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 					else

 						className = isSent ? "hNameOut" : "hNameIn";

 					if (dwFlags & MWF_LOG_UNDERLINE)

-						str.AppendFormat("<span class=\"%s\"><u>%s</u>: </span>", className, szName);

+						str.AppendFormat("<span class=\"%s\"><u>%s</u>: </span>", className, szName.get());

 					else

-						str.AppendFormat("<span class=\"%s\">%s: </span>", className, szName);

+						str.AppendFormat("<span class=\"%s\">%s: </span>", className, szName.get());

 				}

 			}

 			if (dwFlags & MWF_LOG_NEWLINE && eventData->iType != IEED_EVENT_STATUSCHANGE && eventData->iType != IEED_EVENT_ERRMSG && isGroupBreak)

@@ -397,7 +397,7 @@ void TabSRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 			else if (eventData->iType == IEED_EVENT_STATUSCHANGE)

 				className = "statusChange";

 

-			str.AppendFormat("<span class=\"%s\">%s</span>", className, szText);

+			str.AppendFormat("<span class=\"%s\">%s</span>", className, szText.get());

 			str.Append("</div>\n");

 			setLastEventType(MAKELONG(eventData->dwFlags, eventData->iType));

 			setLastEventTime(eventData->time);