more useless conversions removed

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

11 files changed, 18 insertions, 36 deletions

diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp
index bf04806709..77de4a71da 100644
--- a/protocols/Gadu-Gadu/src/groupchat.cpp
+++ b/protocols/Gadu-Gadu/src/groupchat.cpp
@@ -415,7 +415,7 @@ static void gg_gc_resetclistopts(HWND hwndList)
 	SendMessage(hwndList, CLM_SETBKCOLOR, GetSysColor(COLOR_WINDOW), 0);

 	SendMessage(hwndList, CLM_SETGREYOUTFLAGS, 0, 0);

 	SendMessage(hwndList, CLM_SETINDENT, 10, 0);

-	SendMessage(hwndList, CLM_SETHIDEEMPTYGROUPS, (WPARAM)TRUE, 0);

+	SendMessage(hwndList, CLM_SETHIDEEMPTYGROUPS, TRUE, 0);

 	for (i = 0; i <= FONTID_MAX; i++)

 		SendMessage(hwndList, CLM_SETTEXTCOLOR, i, GetSysColor(COLOR_WINDOWTEXT));

 }

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index f6793bf76c..d632de1a22 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -1004,7 +1004,7 @@ static void sttNickListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK*
 	if ((gch->dwData >= CLISTMENUIDMIN) && (gch->dwData <= CLISTMENUIDMAX)) {

 		if (him->m_tszRealJid && *him->m_tszRealJid)

 			if (MCONTACT hContact = ppro->HContactFromJID(him->m_tszRealJid))

-				CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(gch->dwData, MPCF_CONTACTMENU), (LPARAM)hContact);

+				CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(gch->dwData, MPCF_CONTACTMENU), hContact);

 		return;

 	}

 

diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp
index cf78440832..452cb746ae 100644
--- a/protocols/JabberG/src/jabber_disco.cpp
+++ b/protocols/JabberG/src/jabber_disco.cpp
@@ -1406,7 +1406,7 @@ void CJabberProto::ServiceDiscoveryShowMenu(CJabberSDNode *pNode, HTREELISTITEM
 			HMENU hContactMenu = (HMENU)CallService(MS_CLIST_MENUBUILDCONTACT, hContact, 0);

 			GetCursorPos(&pt);

 			int res = TrackPopupMenu(hContactMenu, TPM_RETURNCMD, pt.x, pt.y, 0, m_pDlgServiceDiscovery->GetHwnd(), NULL);

-			CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(res, MPCF_CONTACTMENU), (LPARAM)hContact);

+			CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(res, MPCF_CONTACTMENU), hContact);

 		}

 		break;

 

@@ -1455,7 +1455,7 @@ void CJabberProto::ServiceDiscoveryShowMenu(CJabberSDNode *pNode, HTREELISTITEM
 		if ((res >= CLISTMENUIDMIN) && (res <= CLISTMENUIDMAX)) {

 			MCONTACT hContact = HContactFromJID(pNode->GetJid());

 			if (hContact)

-				CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(res, MPCF_CONTACTMENU), (LPARAM)hContact);

+				CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(res, MPCF_CONTACTMENU), hContact);

 		}

 		break;

 	}

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 87c6f2a8ee..1b52532d08 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -1261,7 +1261,7 @@ void __cdecl CJabberProto::GetAwayMsgThread(void *param)
 		}

 	}

 

-	ProtoBroadcastAck(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)1, (LPARAM)0);

+	ProtoBroadcastAck(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)1, 0);

 }

 

 HANDLE __cdecl CJabberProto::GetAwayMsg(MCONTACT hContact)

@@ -1423,7 +1423,7 @@ void CJabberProto::InfoFrame_OnTransport(CJabberInfoFrame_Event *evt)
 		POINT pt;

 		GetCursorPos(&pt);

 		int res = TrackPopupMenu(hContactMenu, TPM_RETURNCMD, pt.x, pt.y, 0, (HWND)CallService(MS_CLUI_GETHWND, 0, 0), NULL);

-		CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(res, MPCF_CONTACTMENU), (LPARAM)hContact);

+		CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(res, MPCF_CONTACTMENU), hContact);

 	}

 }

 

diff --git a/protocols/JabberG/src/jabber_search.cpp b/protocols/JabberG/src/jabber_search.cpp
index 1a7584c0a1..4ae9f923a3 100644
--- a/protocols/JabberG/src/jabber_search.cpp
+++ b/protocols/JabberG/src/jabber_search.cpp
@@ -148,7 +148,7 @@ void CJabberProto::OnIqResultGetSearchFields(HXML iqNode, CJabberIqInfo *pInfo)
 		ShowWindow(searchHandleDlg,SW_HIDE);

 		if (xNode) {

 			//1. Form

-			PostMessage(searchHandleDlg, WM_USER+11, (WPARAM)xi.copyNode(xNode), (LPARAM)0);

+			PostMessage(searchHandleDlg, WM_USER+11, (WPARAM)xi.copyNode(xNode), 0);

 			HXML xcNode = xmlGetNthChild(xNode, _T("instructions"), 1);

 			if (xcNode)

 				SetDlgItemText(searchHandleDlg, IDC_INSTRUCTIONS, xmlGetText(xcNode));

@@ -171,7 +171,7 @@ void CJabberProto::OnIqResultGetSearchFields(HXML iqNode, CJabberIqInfo *pInfo)
 					MyData->defValue = mir_tstrdup(xmlGetText(chNode));

 					MyData->Order = Order;

 					if (MyData->defValue) MyData->bReadOnly = TRUE;

-					PostMessage(searchHandleDlg,WM_USER+10,(WPARAM)FALSE,(LPARAM)MyData);

+					PostMessage(searchHandleDlg,WM_USER+10,FALSE,(LPARAM)MyData);

 					Order++;

 				}

 			}

diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp
index b526048f78..1f9bd2a4ea 100644
--- a/protocols/JabberG/src/jabber_userinfo.cpp
+++ b/protocols/JabberG/src/jabber_userinfo.cpp
@@ -551,7 +551,7 @@ static INT_PTR CALLBACK JabberUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 			case PSN_INFOCHANGED:

 				{

 					MCONTACT hContact = (MCONTACT)((LPPSHNOTIFY)lParam)->lParam;

-					SendMessage(hwndDlg, WM_JABBER_REFRESH, 0, (LPARAM)hContact);

+					SendMessage(hwndDlg, WM_JABBER_REFRESH, 0, hContact);

 				}

 				break;

 

diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index 60a575f011..c95147adc8 100644
--- a/protocols/JabberG/src/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
@@ -943,7 +943,7 @@ static VOID CALLBACK sttRebuildInfoFrameApcProc(void* param)
 					char name[128];

 					char *jid_copy = mir_t2a(item->jid);

 					mir_snprintf(name, SIZEOF(name), "$/Transports/%s", jid_copy);

-					ppro->m_pInfoFrame->CreateInfoItem(name, true, (LPARAM)hContact);

+					ppro->m_pInfoFrame->CreateInfoItem(name, true, hContact);

 					ppro->m_pInfoFrame->UpdateInfoItem(name, ppro->GetIconHandle(IDI_TRANSPORTL), (TCHAR *)item->jid);

 					ppro->m_pInfoFrame->SetInfoItemCallback(name, &CJabberProto::InfoFrame_OnTransport);

 					mir_free(jid_copy);

diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp
index 692a0df790..bffdd577a6 100644
--- a/protocols/MSN/src/msn_commands.cpp
+++ b/protocols/MSN/src/msn_commands.cpp
@@ -785,7 +785,7 @@ void CMsnProto::sttProcessStatusMessage(char* buf, unsigned len, const char* wli
 

 	if (!ServiceExists(MS_LISTENINGTO_GETPARSEDTEXT) ||

 		!ServiceExists(MS_LISTENINGTO_OVERRIDECONTACTOPTION) ||

-		!CallService(MS_LISTENINGTO_OVERRIDECONTACTOPTION, 0, (LPARAM)hContact))

+		!CallService(MS_LISTENINGTO_OVERRIDECONTACTOPTION, 0, hContact))

 	{

 		// User contact options

 		char *format = mir_strdup(parts[3]);

diff --git a/protocols/Skype/src/skype_blocked.cpp b/protocols/Skype/src/skype_blocked.cpp
index b807f95059..b1a25dc4db 100644
--- a/protocols/Skype/src/skype_blocked.cpp
+++ b/protocols/Skype/src/skype_blocked.cpp
@@ -149,17 +149,8 @@ LRESULT CALLBACK CSkypeProto::SkypeBlockedOptionsSubProc(HWND hwnd, UINT msg, WP
 

 					ListView_DeleteItem(hwnd, lvi.iItem);

 					

-					int nItem = ::SendMessage(

-						::GetDlgItem(GetParent(hwnd), IDC_CONTACTS), 

-						CB_ADDSTRING, 

-						0, 

-						(LPARAM)sid);

-

-					::SendMessage(

-							::GetDlgItem(GetParent(hwnd), IDC_CONTACTS), 

-							CB_SETITEMDATA, 

-							nItem, 

-							(LPARAM)hContact);

+					int nItem = ::SendMessage(::GetDlgItem(GetParent(hwnd), IDC_CONTACTS), CB_ADDSTRING, 0, (LPARAM)sid);

+					::SendMessage(::GetDlgItem(GetParent(hwnd), IDC_CONTACTS), CB_SETITEMDATA, nItem, hContact);

 				}

 			}

 		}

@@ -264,17 +255,8 @@ INT_PTR CALLBACK CSkypeProto::SkypeBlockedOptionsProc(HWND hwndDlg, UINT msg, WP
 					ppro->GetContact((char *)_T2A(sid), contact);

 					if ( !contacts.contains(contact))

 					{

-						nItem = ::SendMessage(

-							::GetDlgItem(hwndDlg, IDC_CONTACTS), 

-							CB_ADDSTRING, 

-							0, 

-							(LPARAM)sid);

-

-						::SendMessage(

-							::GetDlgItem(hwndDlg, IDC_CONTACTS), 

-							CB_SETITEMDATA, 

-							nItem, 

-							(LPARAM)hContact);

+						nItem = ::SendMessage(::GetDlgItem(hwndDlg, IDC_CONTACTS), CB_ADDSTRING, 0, (LPARAM)sid);

+						::SendMessage(::GetDlgItem(hwndDlg, IDC_CONTACTS), CB_SETITEMDATA, nItem, hContact);

 					}

 				}

 

diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp
index 8ca7238f5d..7117c30387 100644
--- a/protocols/VKontakte/src/vk_chats.cpp
+++ b/protocols/VKontakte/src/vk_chats.cpp
@@ -375,7 +375,7 @@ static INT_PTR CALLBACK InviteDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 			for (MCONTACT hContact = db_find_first(ppro->m_szModuleName); hContact; hContact = db_find_next(hContact, ppro->m_szModuleName)) {

 				TCHAR *ptszNick = pcli->pfnGetContactDisplayName(hContact, 0);

 				int idx = SendMessage(hwndCombo, CB_ADDSTRING, 0, LPARAM(ptszNick));

-				SendMessage(hwndCombo, CB_SETITEMDATA, idx, (LPARAM)hContact);

+				SendMessage(hwndCombo, CB_SETITEMDATA, idx, hContact);

 			}

 			SendMessage(hwndCombo, CB_SETCURSEL, 0, 0);

 		}

diff --git a/protocols/Xfire/src/all_statusmsg.cpp b/protocols/Xfire/src/all_statusmsg.cpp
index 7a1ff7b8db..7ded77640a 100644
--- a/protocols/Xfire/src/all_statusmsg.cpp
+++ b/protocols/Xfire/src/all_statusmsg.cpp
@@ -242,7 +242,7 @@ BOOL SetGameStatusMsg()
 					npi.szProto=(char*)protoname->at(i).c_str();

 					npi.status=oltostatus->at(i);

 					npi.szMsg=mir_strdup(statusMsg);

-					CallService("NewAwaySystem/SetStateA", (WPARAM)&npi, (LPARAM)1);

+					CallService("NewAwaySystem/SetStateA", (WPARAM)&npi, 1);

 				}

 				else if (ServiceExists("NewAwaySystem/SetStateW")) {

 					XFireLog("-> SetStatusMsg of %s with NewAwaySystem/SetStateW.",protoname->at(i).c_str());

@@ -252,7 +252,7 @@ BOOL SetGameStatusMsg()
 					npi.szProto=(char*)protoname->at(i).c_str();

 					npi.status=oltostatus->at(i);

 					npi.szMsg=mir_strdup(statusMsg);

-					CallService("NewAwaySystem/SetStateW", (WPARAM)&npi, (LPARAM)1);

+					CallService("NewAwaySystem/SetStateW", (WPARAM)&npi, 1);

 				}

 				else

 				{