From 54ecbb3cf0ddb2576292d0b1714f56cd765ea292 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Mon, 15 Dec 2014 16:34:37 +0000 Subject: IEView: changed warning lavel to w4 git-svn-id: http://svn.miranda-ng.org/main/trunk@11438 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/IEView/src/HistoryHTMLBuilder.cpp | 60 ++++++++++++++++--------------- 1 file changed, 31 insertions(+), 29 deletions(-) (limited to 'plugins/IEView/src/HistoryHTMLBuilder.cpp') diff --git a/plugins/IEView/src/HistoryHTMLBuilder.cpp b/plugins/IEView/src/HistoryHTMLBuilder.cpp index 812b3b5b3d..1672002100 100644 --- a/plugins/IEView/src/HistoryHTMLBuilder.cpp +++ b/plugins/IEView/src/HistoryHTMLBuilder.cpp @@ -79,7 +79,7 @@ bool HistoryHTMLBuilder::isDbEventShown(DBEVENTINFO * dbei) } } -char *HistoryHTMLBuilder::timestampToString(DWORD dwFlags, time_t check) +char *HistoryHTMLBuilder::timestampToString(time_t check) { static char szResult[512]; char str[80]; @@ -88,7 +88,7 @@ char *HistoryHTMLBuilder::timestampToString(DWORD dwFlags, time_t check) dbtts.szDest = str; szResult[0] = '\0'; dbtts.szFormat = (char *)"d t"; - CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM) & dbtts); + CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM)& dbtts); strncat(szResult, str, 500); mir_strncpy(szResult, ptrA(mir_utf8encode(szResult)), 500); return szResult; @@ -109,7 +109,7 @@ void HistoryHTMLBuilder::loadMsgDlgFont(const char *dbSetting, LOGFONTA * lf, CO } if (lf) { mir_snprintf(str, SIZEOF(str), "Font.%s.Size", dbSetting); - lf->lfHeight = (char) db_get_b(NULL, HPPMOD, str, 10); + lf->lfHeight = (char)db_get_b(NULL, HPPMOD, str, 10); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; @@ -158,43 +158,46 @@ void HistoryHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) if (protoSettings == NULL) { return; } - if (protoSettings->getHistoryMode() == Options::MODE_TEMPLATE) { + if (protoSettings->getHistoryMode() == Options::MODE_TEMPLATE) { buildHeadTemplate(view, event, protoSettings); return; } - if (protoSettings->getHistoryMode() == Options::MODE_CSS) { + if (protoSettings->getHistoryMode() == Options::MODE_CSS) { const char *externalCSS = protoSettings->getHistoryCssFilename(); Utils::appendText(&output, &outputSize, "\n", externalCSS); - } else { + } + else { Utils::appendText(&output, &outputSize, ""); Utils::appendText(&output, &outputSize, "\n"); } @@ -226,15 +229,14 @@ void HistoryHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) void HistoryHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) { DWORD dwFlags = db_get_b(NULL, HPPMOD, SRMSGSET_SHOWICONS, 0) ? SMF_LOG_SHOWICONS : 0; - ptrA szRealProto( getRealProto(event->hContact)); + ptrA szRealProto(getRealProto(event->hContact)); IEVIEWEVENTDATA* eventData = event->eventData; - for (int eventIdx = 0; eventData!=NULL && (eventIdx < event->count || event->count==-1); eventData = eventData->next, eventIdx++) { + for (int eventIdx = 0; eventData != NULL && (eventIdx < event->count || event->count == -1); eventData = eventData->next, eventIdx++) { int outputSize; char *output = NULL; bool isSent = (eventData->dwFlags & IEEDF_SENT) != 0; - bool isRTL = (eventData->dwFlags & IEEDF_RTL) != 0; if (eventData->iType == IEED_EVENT_MESSAGE || eventData->iType == IEED_EVENT_STATUSCHANGE || - eventData->iType == IEED_EVENT_URL || eventData->iType == IEED_EVENT_FILE) + eventData->iType == IEED_EVENT_URL || eventData->iType == IEED_EVENT_FILE) { ptrA szName, szText; if (eventData->dwFlags & IEEDF_UNICODE_NICK) @@ -248,7 +250,6 @@ void HistoryHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event szText = encodeUTF8(event->hContact, szRealProto, eventData->pszText, event->codepage, eventData->iType == IEED_EVENT_MESSAGE ? ENF_ALL : 0, isSent); /* History++-specific formatting */ - const char *className = NULL; const char *iconFile = NULL; switch (eventData->iType) { case IEED_EVENT_SYSTEM: @@ -272,7 +273,7 @@ void HistoryHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event Utils::appendText(&output, &outputSize, " "); Utils::appendText(&output, &outputSize, "%s:", isSent ? "nameOut" : "nameIn", szName); - Utils::appendText(&output, &outputSize, "%s
", isSent ? "timeOut" : "timeIn", timestampToString(dwFlags, eventData->time)); + Utils::appendText(&output, &outputSize, "%s
", isSent ? "timeOut" : "timeIn", timestampToString(eventData->time)); if (eventData->iType == IEED_EVENT_FILE) Utils::appendText(&output, &outputSize, "%s:
%s", isSent ? Translate("Outgoing File Transfer") : Translate("Incoming File Transfer"), szText); else if (eventData->iType == IEED_EVENT_URL) @@ -300,7 +301,8 @@ void HistoryHTMLBuilder::appendEvent(IEView *view, IEVIEWEVENT *event) } if (protoSettings->getHistoryMode() & Options::MODE_TEMPLATE) { appendEventTemplate(view, event, protoSettings); - } else{ + } + else{ appendEventNonTemplate(view, event); } } -- cgit v1.2.3