From d8eb1ed0d9f8a694629af5251840e9c6347c9eb3 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 21 Oct 2012 14:12:36 +0000
Subject: fix for status line icons processing in tabSRMM

git-svn-id: http://svn.miranda-ng.org/main/trunk@2022 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TabSRMM/src/chat/log.cpp    | 6 +++---
 plugins/TabSRMM/src/chat/tools.cpp  | 3 +--
 plugins/TabSRMM/src/chat/window.cpp | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'plugins/TabSRMM/src/chat')

diff --git a/plugins/TabSRMM/src/chat/log.cpp b/plugins/TabSRMM/src/chat/log.cpp
index bdadea5bf5..7c8062c1d5 100644
--- a/plugins/TabSRMM/src/chat/log.cpp
+++ b/plugins/TabSRMM/src/chat/log.cpp
@@ -452,7 +452,7 @@ static TCHAR * _tcsrplc(TCHAR **src, const TCHAR *ptrn, const TCHAR *rplc)
 	lRplc = lstrlen(rplc);
 	if (lPtrn && lSrc && lSrc >= lPtrn && (tszFound = _tcsstr(*src, ptrn)) != NULL) {
 		if (lRplc > lPtrn)
-			*src = (TCHAR *) realloc((void *) * src,
+			*src = (TCHAR *) realloc((void*) * src,
 									 sizeof(TCHAR) * (lSrc + lRplc - lPtrn + 1));
 		if (tszTail = (TCHAR *) malloc(sizeof(TCHAR) *
 									   (lSrc - (tszFound - *src) - lPtrn + 1))) {
@@ -462,7 +462,7 @@ static TCHAR * _tcsrplc(TCHAR **src, const TCHAR *ptrn, const TCHAR *rplc)
 			_tcscpy(tszFound, rplc);
 			/* write tail */
 			_tcscpy(tszFound + lRplc, tszTail);
-			free((void *) tszTail);
+			free((void*) tszTail);
 		}
 	}
 	return *src;
@@ -492,7 +492,7 @@ static TCHAR * _tcsnrplc(TCHAR *src, size_t n, const TCHAR *ptrn, const TCHAR *r
 		_tcscpy(tszFound, rplc);
 		/* write tail */
 		_tcscpy(tszFound + lRplc, tszTail);
-		free((void *) tszTail);
+		free((void*) tszTail);
 	}
 	return src;
 }
diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index 7662aaf722..170c320299 100644
--- a/plugins/TabSRMM/src/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -1231,10 +1231,9 @@ void Chat_SetFilters(SESSION_INFO *si)
 	dwMask = M->GetDword(si->hContact, "Chat", "FilterMask", 0);
 
 	si->iLogFilterFlags = dwFlags_default;
-	for (i=0; i < 32; i++) {
+	for (int i=0; i < 32; i++)
 		if (dwMask & (1 << i))
 			si->iLogFilterFlags = (dwFlags_local & (1 << i) ? si->iLogFilterFlags | (1 << i) : si->iLogFilterFlags & ~(1 << i));
-	}
 
 	dwFlags_default = M->GetDword("Chat", "PopupFlags", 0x03E0);
 	dwFlags_local = M->GetDword(si->hContact, "Chat", "PopupFlags", 0x03E0);
diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index 77ee85f9b9..93173b8fb9 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -3045,8 +3045,8 @@ LABEL_SHOWWINDOW:
 												tszAppeal[st++] = _T('\0');
 											}
 											SendDlgItemMessage(hwndDlg, IDC_CHAT_MESSAGE, EM_REPLACESEL,  FALSE, (LPARAM)tszAppeal);
-											free((void *) tr2.lpstrText);
-											free((void *) tszAppeal);
+											free((void*) tr2.lpstrText);
+											free((void*) tszAppeal);
 									}
 								}
 								SetFocus(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE));
@@ -3731,7 +3731,7 @@ LABEL_SHOWWINDOW:
 
 		case WM_DWMCOMPOSITIONCHANGED:
 			BB_RefreshTheme(dat);
-			memset((void *)&dat->pContainer->mOld, -1000, sizeof(MARGINS));
+			memset((void*)&dat->pContainer->mOld, -1000, sizeof(MARGINS));
 			CProxyWindow::verify(dat);
 			break;
 
@@ -3757,7 +3757,7 @@ LABEL_SHOWWINDOW:
 
 		case WM_NCDESTROY:
 			if (dat) {
-				memset((void *)&dat->pContainer->mOld, -1000, sizeof(MARGINS));
+				memset((void*)&dat->pContainer->mOld, -1000, sizeof(MARGINS));
 				PostMessage(dat->pContainer->hwnd, WM_SIZE, 0, 1);
 				delete dat->Panel;
 				if (dat->pContainer->dwFlags & CNT_SIDEBAR)
-- 
cgit v1.2.3