From ed4897b7ef69e862806a8c07f1fd475262d0c36e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 24 Jul 2019 20:58:51 +0300 Subject: massive warning fix --- plugins/IEView/src/ChatHTMLBuilder.cpp | 2 +- plugins/IEView/src/HistoryHTMLBuilder.cpp | 6 +++--- plugins/IEView/src/MUCCHTMLBuilder.cpp | 8 ++++---- plugins/IEView/src/ScriverHTMLBuilder.cpp | 10 +++++----- plugins/IEView/src/TabSRMMHTMLBuilder.cpp | 12 ++++++------ 5 files changed, 19 insertions(+), 19 deletions(-) (limited to 'plugins/IEView/src') 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("%s ", timestampToString(eventData->time)); if ((dwData & IEEDD_GC_SHOW_NICK) && eventData->iType == IEED_GC_EVENT_MESSAGE) - str.AppendFormat("%s: ", isSent ? "nameOut" : "nameIn", szName); + str.AppendFormat("%s: ", isSent ? "nameOut" : "nameIn", szName.get()); if (dwData & IEEDD_GC_MSG_ON_NEW_LINE) str.Append("
"); 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("%s:", isSent ? "nameOut" : "nameIn", szName); + str.AppendFormat("%s:", isSent ? "nameOut" : "nameIn", szName.get()); str.AppendFormat("%s
", isSent ? "timeOut" : "timeIn", timestampToString(eventData->time)); if (eventData->iType == IEED_EVENT_FILE) - str.AppendFormat("%s:
%s", isSent ? Translate("Outgoing File Transfer") : Translate("Incoming File Transfer"), szText); + str.AppendFormat("%s:
%s", isSent ? Translate("Outgoing File Transfer") : Translate("Incoming File Transfer"), szText.get()); else - str.AppendFormat("%s", szText); + str.Append(szText); str.Append("\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("%s ", isSent ? "timestamp" : "timestamp", timestampToString(dwData, eventData->time)); if (dwData & IEEDD_MUCC_SHOW_NICK) - str.AppendFormat("%s: ", isSent ? "nameOut" : "nameIn", szName); + str.AppendFormat("%s: ", isSent ? "nameOut" : "nameIn", szName.get()); if (dwData & IEEDD_MUCC_MSG_ON_NEW_LINE) str.Append("
"); @@ -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("%s", className, style.c_str(), szText); + str.AppendFormat("%s", className, style.c_str(), szText.get()); str.Append("\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("%s ", "timestamp", timestampToString(dwData, eventData->time)); str.AppendFormat("", className); - str.AppendFormat(Translate(eventText), szText); + str.AppendFormat(Translate(eventText), szText.get()); str.Append(""); str.Append("\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("
", "divError"); - str.AppendFormat(" %s: %s", className, Translate("Error"), szText); + str.AppendFormat(" %s: %s", className, Translate("Error"), szText.get()); str.Append("
\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(" %s", isSent ? "nameOut" : "nameIn", szName); + str.AppendFormat(" %s", isSent ? "nameOut" : "nameIn", szName.get()); else - str.AppendFormat("%s", isSent ? "nameOut" : "nameIn", szName); + str.AppendFormat("%s", 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("%s ", szName); + else str.AppendFormat("%s ", 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("%s: %s", className, - (isSent) ? Translate("File sent") : Translate("File received"), szText); + (isSent) ? Translate("File sent") : Translate("File received"), szText.get()); } - else str.AppendFormat("%s", className, szText); + else str.AppendFormat("%s", className, szText.get()); str.Append("\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("%s%s", className, szName, (dwFlags & MWF_LOG_SHOWTIME) ? " " : ": "); + str.AppendFormat("%s%s", className, szName.get(), (dwFlags & MWF_LOG_SHOWTIME) ? " " : ": "); else - str.AppendFormat("%s%s", className, szName, (dwFlags & MWF_LOG_SHOWTIME) ? " " : ": "); + str.AppendFormat("%s%s", 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("%s ", szName); + str.AppendFormat("%s ", 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("%s: ", className, szName); + str.AppendFormat("%s: ", className, szName.get()); else - str.AppendFormat("%s: ", className, szName); + str.AppendFormat("%s: ", 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("%s", className, szText); + str.AppendFormat("%s", className, szText.get()); str.Append("\n"); setLastEventType(MAKELONG(eventData->dwFlags, eventData->iType)); setLastEventTime(eventData->time); -- cgit v1.2.3