another bunch of useless conversions died

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

7 files changed, 17 insertions, 17 deletions

diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index 9f3f15c3bf..f9550d81c4 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -582,7 +582,7 @@ LBL_Def:
 

 			if (contact) {

 				if (ProtoServiceExists(szProto, PS_GETADVANCEDSTATUSICON)) {

-					int iconId = ProtoCallService(szProto, PS_GETADVANCEDSTATUSICON, (WPARAM)hContact, 0);

+					int iconId = ProtoCallService(szProto, PS_GETADVANCEDSTATUSICON, hContact, 0);

 					if (iconId != -1)

 						contact->xStatusIcon = iconId >> 16;

 				}

diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index 856dfe77e7..421e588307 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -105,7 +105,7 @@ int AddContactToGroup(struct ClcData *dat, ClcGroup *group, MCONTACT hContact)
 	else

 		p->bIsMeta = FALSE;

 	if (p->bIsMeta && cfg::dat.bMetaAvail && !(cfg::dat.dwFlags & CLUI_USEMETAICONS)) {

-		p->hSubContact = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0);

+		p->hSubContact = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, hContact, 0);

 		p->metaProto = GetContactProto(p->hSubContact);

 		p->iImage = pcli->pfnGetContactIcon(p->hSubContact);

 	}

@@ -266,11 +266,11 @@ BYTE GetCachedStatusMsg(TExtraCache *p, char *szProto)
 			CUSTOM_STATUS cst = { sizeof(cst) };

 			cst.flags = CSSF_MASK_STATUS;

 			cst.status = &xStatus;

-			if (ProtoServiceExists(szProto, PS_GETCUSTOMSTATUSEX) && !ProtoCallService(szProto, PS_GETCUSTOMSTATUSEX, (WPARAM)hContact, (LPARAM)&cst) && xStatus > 0) {

+			if (ProtoServiceExists(szProto, PS_GETCUSTOMSTATUSEX) && !ProtoCallService(szProto, PS_GETCUSTOMSTATUSEX, hContact, (LPARAM)&cst) && xStatus > 0) {

 				cst.flags = CSSF_MASK_NAME | CSSF_DEFAULT_NAME | CSSF_TCHAR;

  				cst.wParam = &xStatus2;

 				cst.ptszName = xStatusName;

-				if ( !CallProtoService(szProto, PS_GETCUSTOMSTATUSEX, (WPARAM)hContact, (LPARAM)&cst)) {

+				if ( !CallProtoService(szProto, PS_GETCUSTOMSTATUSEX, hContact, (LPARAM)&cst)) {

 					TCHAR *szwXstatusName = TranslateTS(xStatusName);

 					p->statusMsg = (TCHAR *)realloc(p->statusMsg, (lstrlen(szwXstatusName) + 2) * sizeof(TCHAR));

 					_tcsncpy(p->statusMsg, szwXstatusName, lstrlen(szwXstatusName) + 1);

diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp
index 613936a45d..56ac5500b9 100644
--- a/plugins/Clist_nicer/src/clistevents.cpp
+++ b/plugins/Clist_nicer/src/clistevents.cpp
@@ -375,10 +375,10 @@ int RemoveEvent(MCONTACT hContact, HANDLE hDbEvent)
 	if (bUnstick) {

 		// clear "sticky" (sort) status

 

-		hItem = (HANDLE)SendMessage(pcli->hwndContactTree, CLM_FINDCONTACT, (WPARAM)hContact, 0);

+		hItem = (HANDLE)SendMessage(pcli->hwndContactTree, CLM_FINDCONTACT, hContact, 0);

 		if (hItem) {

 			SendMessage(pcli->hwndContactTree, CLM_SETSTICKY, (WPARAM) hItem, 0);

-			pcli->pfnClcBroadcast(INTM_PROTOCHANGED, (WPARAM)hContact, 0);

+			pcli->pfnClcBroadcast(INTM_PROTOCHANGED, hContact, 0);

 	}	}

 

 	if (hContact == cfg::dat.hUpdateContact || (INT_PTR)hDbEvent == 1)

diff --git a/plugins/Clist_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp
index c71996de4c..74498cab6a 100644
--- a/plugins/Clist_nicer/src/clistmenus.cpp
+++ b/plugins/Clist_nicer/src/clistmenus.cpp
@@ -81,7 +81,7 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA
 			hContact = lParam;

 			SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)hContact);

 			dwMask = cfg::getDword(hContact, "Ignore", "Mask1", 0);

-			SendMessage(hWnd, WM_USER + 100, (WPARAM)hContact, dwMask);

+			SendMessage(hWnd, WM_USER + 100, hContact, dwMask);

 			SendMessage(hWnd, WM_USER + 120, 0, 0);

 			TranslateDialogDefault(hWnd);

 			hwndAdd = GetDlgItem(hWnd, IDC_IGN_ADDPERMANENTLY); // CreateWindowEx(0, _T("CLCButtonClass"), _T("FOO"), WS_VISIBLE | BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 200, 276, 106, 24, hWnd, (HMENU)IDC_IGN_ADDPERMANENTLY, g_hInst, NULL);

@@ -121,7 +121,7 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA
 					DWORD dwXMask = cfg::getDword(hContact, "CList", "CLN_xmask", 0);

 					int   i = 0;

 

-					mir_sntprintf(szTitle, 512, TranslateT("Contact list display and ignore options for %s"), contact ? contact->szText : (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR));

+					mir_sntprintf(szTitle, 512, TranslateT("Contact list display and ignore options for %s"), contact ? contact->szText : (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR));

 

 					SetWindowText(hWnd, szTitle);

 					SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedIcon(SKINICON_OTHER_MIRANDA));

@@ -167,13 +167,13 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA
 	case WM_COMMAND:

 		switch(LOWORD(wParam)) {

 		case IDC_IGN_PRIORITY:

-			SendMessage(pcli->hwndContactTree, CLM_TOGGLEPRIORITYCONTACT, (WPARAM)hContact, 0);

+			SendMessage(pcli->hwndContactTree, CLM_TOGGLEPRIORITYCONTACT, hContact, 0);

 			return 0;

 		case IDC_IGN_ALL:

-			SendMessage(hWnd, WM_USER + 100, (WPARAM)hContact, (LPARAM)0xffffffff);

+			SendMessage(hWnd, WM_USER + 100, hContact, (LPARAM)0xffffffff);

 			return 0;

 		case IDC_IGN_NONE:

-			SendMessage(hWnd, WM_USER + 100, (WPARAM)hContact, 0);

+			SendMessage(hWnd, WM_USER + 100, hContact, 0);

 		  	return 0;

 		case IDC_IGN_ALWAYSONLINE:

 			if (IsDlgButtonChecked(hWnd, IDC_IGN_ALWAYSONLINE))

diff --git a/plugins/Clist_nicer/src/clistmod.cpp b/plugins/Clist_nicer/src/clistmod.cpp
index 2a838b39dc..74bb93ffad 100644
--- a/plugins/Clist_nicer/src/clistmod.cpp
+++ b/plugins/Clist_nicer/src/clistmod.cpp
@@ -55,7 +55,7 @@ int IconFromStatusMode(const char *szProto, int status, MCONTACT hContact, HICON
 	int finalStatus;

 

 	if (szProto != NULL && !strcmp(szProto, cfg::dat.szMetaName) && cfg::dat.bMetaAvail && hContact != 0 && !(cfg::dat.dwFlags & CLUI_USEMETAICONS)) {

-		MCONTACT hSubContact = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0);

+		MCONTACT hSubContact = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, hContact, 0);

 		szFinalProto = GetContactProto(hSubContact);

 		finalStatus = (status == 0) ? (WORD) cfg::getWord(hSubContact, szFinalProto, "Status", ID_STATUS_OFFLINE) : status;

 		hContact = hSubContact;

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index 5772d3a0a4..763cb363cb 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -721,7 +721,7 @@ static int ServiceParamsOK(ButtonItem *item, WPARAM *wParam, LPARAM *lParam, MCO
 			return 0;

 

 		if (item->dwFlags & BUTTON_PASSHCONTACTW)

-			*wParam = (WPARAM)hContact;

+			*wParam = hContact;

 		else if (item->dwFlags & BUTTON_PASSHCONTACTL)

 			*lParam = (LPARAM)hContact;

 	}

diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp
index cd163a2f36..0be4ed7741 100644
--- a/plugins/Clist_nicer/src/viewmodes.cpp
+++ b/plugins/Clist_nicer/src/viewmodes.cpp
@@ -123,7 +123,7 @@ static void ShowPage(HWND hwnd, int page)
 static int UpdateClistItem(MCONTACT hContact, DWORD mask)

 {

 	for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)

-		SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_SETEXTRAIMAGE, (WPARAM)hContact, MAKELONG(i - ID_STATUS_OFFLINE,

+		SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_SETEXTRAIMAGE, hContact, MAKELONG(i - ID_STATUS_OFFLINE,

 		(1 << (i - ID_STATUS_OFFLINE)) & mask ? i - ID_STATUS_OFFLINE : nullImage));

 

 	return 0;

@@ -142,7 +142,7 @@ static DWORD GetMaskForItem(HANDLE hItem)
 static void UpdateStickies()

 {

 	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

-		MCONTACT hItem = (MCONTACT)SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);

+		MCONTACT hItem = (MCONTACT)SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_FINDCONTACT, hContact, 0);

 		if (hItem)

 			SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItem, cfg::getByte(hContact, "CLVM", g_szModename, 0) ? 1 : 0);

 		DWORD localMask = HIWORD(cfg::getDword(hContact, "CLVM", g_szModename, 0));

@@ -394,7 +394,7 @@ void SaveState()
 			dwGlobalMask = GetMaskForItem(hInfoItem);

 

 			for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

-				hItem = (HANDLE)SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);

+				hItem = (HANDLE)SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_FINDCONTACT, hContact, 0);

 				if (hItem) {

 					if (SendDlgItemMessage(clvmHwnd, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0)) {

 						dwLocalMask = GetMaskForItem(hItem);

@@ -719,7 +719,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		case IDC_CLEARALL:

 			{

 				for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

-					HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);

+					HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, hContact, 0);

 					if (hItem)

 						SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItem, 0);

 				}