another bunch of useless conversions died

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

4 files changed, 12 insertions, 12 deletions

diff --git a/plugins/TipperYM/src/message_pump.cpp b/plugins/TipperYM/src/message_pump.cpp
index c7609c6f50..a969d48251 100644
--- a/plugins/TipperYM/src/message_pump.cpp
+++ b/plugins/TipperYM/src/message_pump.cpp
@@ -171,7 +171,7 @@ unsigned int CALLBACK MessagePumpThread(void *param)
 						PostMPMessage(MUM_CREATEPOPUP, 0, 0);

 					}

 					else if (!opt.bWaitForContent && hwndTip)

-						SendMessage(hwndTip, PUM_SETSTATUSTEXT, (WPARAM)hContact, (LPARAM)swzMsg);

+						SendMessage(hwndTip, PUM_SETSTATUSTEXT, hContact, (LPARAM)swzMsg);

 					else if (swzMsg)

 						mir_free(swzMsg);

 

diff --git a/plugins/TipperYM/src/options.cpp b/plugins/TipperYM/src/options.cpp
index 07d22050da..41aef2fc2b 100644
--- a/plugins/TipperYM/src/options.cpp
+++ b/plugins/TipperYM/src/options.cpp
@@ -2102,7 +2102,7 @@ INT_PTR CALLBACK DlgProcFavouriteContacts(HWND hwndDlg, UINT msg, WPARAM wParam,
 		SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETLEFTMARGIN, 2, 0);

 		{

 			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 && db_get_b(hContact, MODULE, "FavouriteContact", 0))

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

 			}

@@ -2119,7 +2119,7 @@ INT_PTR CALLBACK DlgProcFavouriteContacts(HWND hwndDlg, UINT msg, WPARAM wParam,
 				int count = 0;

 

 				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) {

 						isChecked = (BYTE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0);

 						db_set_b(hContact, MODULE, "FavouriteContact", isChecked);

diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp
index dc460c5527..8318be45e8 100644
--- a/plugins/TipperYM/src/popwin.cpp
+++ b/plugins/TipperYM/src/popwin.cpp
@@ -1667,7 +1667,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 									bTitlePainted = true;

 								}

 

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

+								TCHAR *swzNick = (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR);			

 								if (opt.iFavoriteContFlags & FAVCONT_APPEND_PROTO) {

 									TCHAR *swzProto = a2t(proto);

 									mir_sntprintf(swzName, 256, _T("%s (%s)"), swzNick, swzProto);

diff --git a/plugins/TipperYM/src/subst.cpp b/plugins/TipperYM/src/subst.cpp
index 441897d5f0..68bf45606d 100644
--- a/plugins/TipperYM/src/subst.cpp
+++ b/plugins/TipperYM/src/subst.cpp
@@ -250,7 +250,7 @@ TCHAR *GetStatusMessageText(MCONTACT hContact)
 	char *szProto = GetContactProto(hContact);

 	if (szProto) {

 		if (!strcmp(szProto, szMetaModuleName))

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

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

 		else {

 			WORD wStatus = (int)CallProtoService(szProto, PS_GETSTATUS, 0, 0);

 			if (wStatus == ID_STATUS_OFFLINE)

@@ -303,7 +303,7 @@ bool GetSysSubstText(MCONTACT hContact, TCHAR *swzRawSpec, TCHAR *buff, int buff
 	}

 	else if (!_tcscmp(swzRawSpec, _T("account")))

 	{

-		char *szProto = ( char* )CallService(MS_PROTO_GETCONTACTBASEACCOUNT, (WPARAM)hContact, 0);

+		char *szProto = ( char* )CallService(MS_PROTO_GETCONTACTBASEACCOUNT, hContact, 0);

 		if ((INT_PTR)szProto == CALLSERVICE_NOTFOUND)

 		{

 			return GetSysSubstText(hContact, _T("proto"), buff, bufflen);

@@ -353,7 +353,7 @@ bool GetSysSubstText(MCONTACT hContact, TCHAR *swzRawSpec, TCHAR *buff, int buff
 	else if (!_tcscmp(swzRawSpec, _T("meta_subname")))

 	{

 		// get contact list name of active subcontact

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

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

 		if (!hSubContact || (INT_PTR)hSubContact == CALLSERVICE_NOTFOUND) return false;

 		TCHAR *swzNick = (TCHAR *) CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hSubContact, GCDNF_TCHAR);

 		if (swzNick) _tcsncpy(buff, swzNick, bufflen);

@@ -361,7 +361,7 @@ bool GetSysSubstText(MCONTACT hContact, TCHAR *swzRawSpec, TCHAR *buff, int buff
 	}

 	else if (!_tcscmp(swzRawSpec, _T("meta_subuid")))

 	{

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

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

 		if (!hSubContact || (INT_PTR)hSubContact == CALLSERVICE_NOTFOUND)

 			return false;

 		return Uid(hSubContact, 0, buff, bufflen);

@@ -369,7 +369,7 @@ bool GetSysSubstText(MCONTACT hContact, TCHAR *swzRawSpec, TCHAR *buff, int buff
 	else if (!_tcscmp(swzRawSpec, _T("meta_subproto")))

 	{

 		// get protocol of active subcontact

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

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

 		if (!hSubContact || (INT_PTR)hSubContact == CALLSERVICE_NOTFOUND)

 			return false;

 		return GetSysSubstText(hSubContact, _T("account"), buff, bufflen);

@@ -414,13 +414,13 @@ bool GetSysSubstText(MCONTACT hContact, TCHAR *swzRawSpec, TCHAR *buff, int buff
 		char *szProto = GetContactProto(hContact);

 		if (szProto && !strcmp(szProto, szMetaModuleName))

 		{

-			iNumber = CallService(MS_MC_GETNUMCONTACTS, (WPARAM)hContact, 0);

-			hTmpContact = (MCONTACT)CallService(MS_MC_GETSUBCONTACT, (WPARAM)hContact, 0);

+			iNumber = CallService(MS_MC_GETNUMCONTACTS, hContact, 0);

+			hTmpContact = (MCONTACT)CallService(MS_MC_GETSUBCONTACT, hContact, 0);

 		}

 

 		for (int i = 0; i < iNumber; i++) {

 			if (i > 0)

-				hTmpContact = (MCONTACT)CallService(MS_MC_GETSUBCONTACT, (WPARAM)hContact, i);

+				hTmpContact = (MCONTACT)CallService(MS_MC_GETSUBCONTACT, hContact, i);

 			dwRecountTs = db_get_dw(hTmpContact, MODULE, "LastCountTS", 0);

 			dwTime = (DWORD)time(0);

 			dwDiff = (dwTime - dwRecountTs);