From b385ab819019ec29cd44e9c9e6ae8be333298ef2 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 12 Jun 2016 10:57:29 +0000
Subject: code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@16950 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_modern/src/modern_aniavatars.cpp |  8 ++++----
 plugins/Sessions/Src/Main.cpp                  | 11 ++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'plugins')

diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp
index c6d731ae1f..fe7a2fd8e6 100644
--- a/plugins/Clist_modern/src/modern_aniavatars.cpp
+++ b/plugins/Clist_modern/src/modern_aniavatars.cpp
@@ -289,7 +289,7 @@ static void _AniAva_RemoveAniAvaDC()
 static void _AniAva_RealRemoveAvatar(DWORD UniqueID)
 {
 	for (int j = 0; j < s_AniAvatarList.getCount(); j++) {
-		ANIAVA_INFO *aai = (ANIAVA_INFO *)s_AniAvatarList[j];
+		ANIAVA_INFO *aai = s_AniAvatarList[j];
 		if (aai->dwAvatarUniqId == UniqueID) {
 			aai->nRefCount--;
 			if (aai->nRefCount == 0) {
@@ -300,7 +300,7 @@ static void _AniAva_RealRemoveAvatar(DWORD UniqueID)
 				_AniAva_ReduceAvatarImages(aai->nStripTop, aai->FrameSize.cx*aai->nFrameCount, FALSE);
 				for (int k = 0; k < s_AniAvatarList.getCount(); k++) {
 					if (k != j) {
-						ANIAVA_INFO *taai = (ANIAVA_INFO *)s_AniAvatarList[k];
+						ANIAVA_INFO *taai = s_AniAvatarList[k];
 						if (taai->nStripTop>aai->nStripTop)
 							taai->nStripTop -= aai->FrameSize.cx*aai->nFrameCount;
 					}
@@ -311,7 +311,7 @@ static void _AniAva_RealRemoveAvatar(DWORD UniqueID)
 					int newHeight = 0;
 					for (int i = 0; i < s_AniAvatarList.getCount(); i++)
 						if (i != j)
-							newHeight = max(newHeight, ((ANIAVA_INFO *)s_AniAvatarList[i])->FrameSize.cy);
+							newHeight = max(newHeight, s_AniAvatarList[i]->FrameSize.cy);
 
 					HDC hNewDC = CreateCompatibleDC(NULL);
 					HBITMAP hNewBmp = ske_CreateDIB32(newWidth, newHeight);
@@ -397,7 +397,7 @@ static int	_AniAva_LoadAvatarFromImage(TCHAR * szFileName, int width, int height
 		GdiFlush();
 		_AniAva_ResumePainting();
 	}
-	else paai = (ANIAVA_INFO*)s_AniAvatarList[idx];
+	else paai = s_AniAvatarList[idx];
 
 	if (paai == NULL)
 		return 0;
diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp
index fd71716171..f691a86397 100644
--- a/plugins/Sessions/Src/Main.cpp
+++ b/plugins/Sessions/Src/Main.cpp
@@ -122,12 +122,10 @@ INT_PTR CALLBACK SaveSessionDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM l
 	switch (msg) {
 	case WM_INITDIALOG:
 		TranslateDialogDefault(hdlg);
-		{
-			LoadSessionToCombobox(hdlg, 1, 5, "UserSessionDsc", 0);
+		LoadSessionToCombobox(hdlg, 1, 5, "UserSessionDsc", 0);
 
-			LoadPosition(hdlg, "SaveDlg");
-			ShowWindow(hdlg, SW_SHOW);
-		}
+		LoadPosition(hdlg, "SaveDlg");
+		ShowWindow(hdlg, SW_SHOW);
 		break;
 
 	case WM_CLOSE:
@@ -397,13 +395,12 @@ INT_PTR CALLBACK LoadSessionDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM)
 INT_PTR CloseCurrentSession(WPARAM, LPARAM)
 {
 	HWND hWnd;
-	int i = 0;
 	MessageWindowInputData  mwid;
 	MessageWindowData  mwd;
 
 	while (session_list[0] != 0) {
 		mwid.cbSize = sizeof(MessageWindowInputData);
-		mwid.hContact = session_list[i];
+		mwid.hContact = session_list[0];
 		mwid.uFlags = MSG_WINDOW_UFLAG_MSG_BOTH;
 
 		mwd.cbSize = sizeof(MessageWindowData);
-- 
cgit v1.2.3