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/TemplateHTMLBuilder.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/IEView/src/TemplateHTMLBuilder.cpp') diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp index c45ac7e528..10ce8161c0 100644 --- a/plugins/IEView/src/TemplateHTMLBuilder.cpp +++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp @@ -344,7 +344,7 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event, char *szRealProto = getProto(hRealContact); char *szProto = getProto(event->pszProto, event->hContact); tempBase[0] = '\0'; - + TemplateMap *tmpm = getTemplateMap(protoSettings); if (tmpm != NULL) { strcpy(tempBase, "file://"); @@ -427,9 +427,9 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event, bool isHistory = (eventData->time < (DWORD)getStartedTime() && (eventData->dwFlags & IEEDF_READ || eventData->dwFlags & IEEDF_SENT)); bool isGroupBreak = true; if ((getFlags(protoSettings) & Options::LOG_GROUP_MESSAGES) && eventData->dwFlags == LOWORD(getLastEventType()) - && eventData->iType == IEED_EVENT_MESSAGE && HIWORD(getLastEventType()) == IEED_EVENT_MESSAGE - && (isSameDate(eventData->time, getLastEventTime())) - && (((eventData->time < (DWORD)startedTime) == (getLastEventTime() < (DWORD)startedTime)) || !(eventData->dwFlags & IEEDF_READ))) + && eventData->iType == IEED_EVENT_MESSAGE && HIWORD(getLastEventType()) == IEED_EVENT_MESSAGE + && (isSameDate(eventData->time, getLastEventTime())) + && (((eventData->time < (DWORD)startedTime) == (getLastEventTime() < (DWORD)startedTime)) || !(eventData->dwFlags & IEEDF_READ))) isGroupBreak = false; if (isSent) { @@ -445,7 +445,7 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event, tmpltName[0] = groupTemplate; tmpltName[1] = NULL; groupTemplate = NULL; - + char *szName = NULL, *szText = NULL, *szFileDesc = NULL; if (event->eventData->dwFlags & IEEDF_UNICODE_NICK) szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNickW, ENF_NAMESMILEYS, true); @@ -507,7 +507,7 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event, Template *tmplt = tmpm->getTemplate(tmpltName[i]); if (tmplt == NULL) continue; - + for (Token *token = tmplt->getTokens(); token != NULL; token = token->getNext()) { const char *tokenVal; tokenVal = NULL; -- cgit v1.2.3