these conversions aren't needed either

git-svn-id: http://svn.miranda-ng.org/main/trunk@8088 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 13 insertions, 13 deletions

diff --git a/plugins/AVS/src/acc.cpp b/plugins/AVS/src/acc.cpp
index 4f5e423ace..ea9a39e6fb 100644
--- a/plugins/AVS/src/acc.cpp
+++ b/plugins/AVS/src/acc.cpp
@@ -556,7 +556,7 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg,  WPARAM wParam, LPARAM l
 		{

 			DestroyAnimation(hwnd, data);

 

-			data->hContact = (MCONTACT)lParam;

+			data->hContact = lParam;

 			if (lParam == NULL)

 				data->proto[0] = '\0';

 			else

@@ -708,7 +708,7 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg,  WPARAM wParam, LPARAM l
 		}

 		case DM_AVATARCHANGED:

 		{

-			if (data->hContact == (MCONTACT)wParam)

+			if (data->hContact == wParam)

 			{

 				DestroyAnimation(hwnd, data);

 				StartAnimation(hwnd, data);

diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp
index 0a4997a54e..a0de907cfd 100644
--- a/plugins/AVS/src/main.cpp
+++ b/plugins/AVS/src/main.cpp
@@ -134,7 +134,7 @@ static int MetaChanged(WPARAM wParam, LPARAM lParam)
 

 	AVATARCACHEENTRY *ace;

 

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	MCONTACT hSubContact = GetContactThatHaveTheAvatar(hContact);

 

 	// Get the node

@@ -242,7 +242,7 @@ static int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
 

 static int ContactDeleted(WPARAM wParam, LPARAM lParam)

 {

-	DeleteAvatarFromCache((MCONTACT)wParam, TRUE);

+	DeleteAvatarFromCache(wParam, TRUE);

 	return 0;

 }

 

diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp
index 580e375048..6d28942e5c 100644
--- a/plugins/AVS/src/options.cpp
+++ b/plugins/AVS/src/options.cpp
@@ -501,10 +501,10 @@ INT_PTR CALLBACK DlgProcAvatarOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 			struct WindowData *dat = (struct WindowData *)malloc(sizeof(struct WindowData));

 

 			if (dat)

-				dat->hContact = (MCONTACT)lParam;

+				dat->hContact = lParam;

 

 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)dat);

-			hContact = (MCONTACT)lParam;

+			hContact = lParam;

 			TranslateDialogDefault(hwndDlg);

 			if (hContact) {

 				szNick = (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR);

@@ -771,7 +771,7 @@ static INT_PTR CALLBACK DlgProcAvatarUserInfo(HWND hwndDlg, UINT msg, WPARAM wPa
 			dat = (struct WindowData *) malloc(sizeof(struct WindowData));

 			if (dat == NULL)

 				return FALSE;

-			dat->hContact = (MCONTACT)lParam;

+			dat->hContact = lParam;

 

 			HWND protopic = GetDlgItem(hwndDlg, IDC_PROTOPIC);

 			SendMessage(protopic, AVATAR_SETCONTACT, 0, (LPARAM) dat->hContact);

@@ -781,7 +781,7 @@ static INT_PTR CALLBACK DlgProcAvatarUserInfo(HWND hwndDlg, UINT msg, WPARAM wPa
 			SendMessage(protopic, AVATAR_SETRESIZEIFSMALLER, 0, (LPARAM) FALSE);

 

 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)dat);

-			hContact = (MCONTACT)lParam;

+			hContact = lParam;

 			TranslateDialogDefault(hwndDlg);

 			SendMessage(hwndDlg, DM_SETAVATARNAME, 0, 0);

 			CheckDlgButton(hwndDlg, IDC_PROTECTAVATAR, db_get_b(hContact, "ContactPhoto", "Locked", 0) ? TRUE : FALSE);

@@ -1148,7 +1148,7 @@ int OnDetailsInit(WPARAM wParam, LPARAM lParam)
 	odp.hInstance = g_hInst;

 	odp.pszTitle = LPGEN("Avatar");

 

-	MCONTACT hContact = (MCONTACT)lParam;

+	MCONTACT hContact = lParam;

 	if (hContact == NULL) {

 		// User dialog

 		odp.pfnDlgProc = DlgProcAvatarProtoInfo;

diff --git a/plugins/AVS/src/services.cpp b/plugins/AVS/src/services.cpp
index b02f0e5d19..d854e4fd1c 100644
--- a/plugins/AVS/src/services.cpp
+++ b/plugins/AVS/src/services.cpp
@@ -31,7 +31,7 @@ INT_PTR GetAvatarBitmap(WPARAM wParam, LPARAM lParam)
 	if (wParam == 0 || g_shutDown || fei == NULL)

 		return 0;

 

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	hContact = GetContactThatHaveTheAvatar(hContact);

 

 	// Get the node

@@ -46,7 +46,7 @@ INT_PTR GetAvatarBitmap(WPARAM wParam, LPARAM lParam)
 

 INT_PTR ProtectAvatar(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	BYTE was_locked = db_get_b(hContact, "ContactPhoto", "Locked", 0);

 

 	if (fei == NULL || was_locked == (BYTE)lParam)      // no need for redundant lockings...

@@ -188,12 +188,12 @@ static INT_PTR avSetAvatar(MCONTACT hContact, TCHAR *tszPath)
 

 INT_PTR SetAvatar(WPARAM wParam, LPARAM lParam)

 {

-	return avSetAvatar((MCONTACT)wParam, _A2T((const char*)lParam));

+	return avSetAvatar(wParam, _A2T((const char*)lParam));

 }

 

 INT_PTR SetAvatarW(WPARAM wParam, LPARAM lParam)

 {

-	return avSetAvatar((MCONTACT)wParam, (TCHAR*)lParam);

+	return avSetAvatar(wParam, (TCHAR*)lParam);

 }

 

 /*