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, 19 insertions, 19 deletions

diff --git a/protocols/IcqOscarJ/src/fam_03buddy.cpp b/protocols/IcqOscarJ/src/fam_03buddy.cpp
index c3c8098b98..bf1a5ff66e 100644
--- a/protocols/IcqOscarJ/src/fam_03buddy.cpp
+++ b/protocols/IcqOscarJ/src/fam_03buddy.cpp
@@ -556,7 +556,7 @@ void CIcqProto::handleUserOnline(BYTE *buf, WORD wLen, serverthread_info *info)
 			AddToSpammerList(dwUIN);

 			if (getByte("PopupsSpamEnabled", DEFAULT_SPAM_POPUPS_ENABLED))

 				ShowPopupMsg(hContact, LPGEN("Spambot Detected"), LPGEN("Contact deleted & further events blocked."), POPTYPE_SPAM);

-			CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0);

+			CallService(MS_DB_CONTACT_DELETE, hContact, 0);

 

 			debugLogA("Contact %u deleted", dwUIN);

 		}

diff --git a/protocols/IcqOscarJ/src/fam_04message.cpp b/protocols/IcqOscarJ/src/fam_04message.cpp
index b9c227d10b..499192fc2b 100644
--- a/protocols/IcqOscarJ/src/fam_04message.cpp
+++ b/protocols/IcqOscarJ/src/fam_04message.cpp
@@ -1688,8 +1688,8 @@ void CIcqProto::sendMessageTypesAck(MCONTACT hContact, int bUnicode, message_ack
 {

 	if (pArgs)

 	{

-		if ((pArgs->msgType == MTYPE_PLAIN && !CallService(MS_IGNORE_ISIGNORED, (WPARAM)hContact, IGNOREEVENT_MESSAGE))

-			|| (pArgs->msgType == MTYPE_URL && !CallService(MS_IGNORE_ISIGNORED, (WPARAM)hContact, IGNOREEVENT_URL))

+		if ((pArgs->msgType == MTYPE_PLAIN && !CallService(MS_IGNORE_ISIGNORED, hContact, IGNOREEVENT_MESSAGE))

+			|| (pArgs->msgType == MTYPE_URL && !CallService(MS_IGNORE_ISIGNORED, hContact, IGNOREEVENT_URL))

 			|| pArgs->msgType == MTYPE_CONTACTS)

 		{

 			if (pArgs->bType == MAT_SERVER_ADVANCED)

@@ -2904,12 +2904,12 @@ void CIcqProto::handleTypingNotification(BYTE *buf, WORD wLen, WORD wFlags, DWOR
 

 	case MTN_FINISHED:

 	case MTN_TYPED:

-		CallService(MS_PROTO_CONTACTISTYPING, (WPARAM)hContact, (LPARAM)PROTOTYPE_CONTACTTYPING_OFF);

+		CallService(MS_PROTO_CONTACTISTYPING, hContact, (LPARAM)PROTOTYPE_CONTACTTYPING_OFF);

 		debugLogA("%s has stopped typing (ch %u).", strUID(dwUin, szUid), wChannel);

 		break;

 

 	case MTN_BEGUN:

-		CallService(MS_PROTO_CONTACTISTYPING, (WPARAM)hContact, (LPARAM)60);

+		CallService(MS_PROTO_CONTACTISTYPING, hContact, (LPARAM)60);

 		debugLogA("%s is typing a message (ch %u).", strUID(dwUin, szUid), wChannel);

 		break;

 

diff --git a/protocols/IcqOscarJ/src/fam_13servclist.cpp b/protocols/IcqOscarJ/src/fam_13servclist.cpp
index a0d238cb99..df29ad0e92 100644
--- a/protocols/IcqOscarJ/src/fam_13servclist.cpp
+++ b/protocols/IcqOscarJ/src/fam_13servclist.cpp
@@ -1295,7 +1295,7 @@ void CIcqProto::handleServerCListReply(BYTE *buf, WORD wLen, WORD wFlags, server
 					// Set apparent mode & ignore

 					setWord(hContact, "ApparentMode", ID_STATUS_OFFLINE);

 					// set ignore all events

-					CallService(MS_IGNORE_IGNORE, (WPARAM)hContact, IGNOREEVENT_ALL);

+					CallService(MS_IGNORE_IGNORE, hContact, IGNOREEVENT_ALL);

 					debugLogA("Ignore-contact (%s)", szRecordName);

 				}

 				else

diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index bfe5e66277..02aa469ba6 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -458,7 +458,7 @@ int CIcqProto::AuthDeny(HANDLE hDbEvent, const TCHAR* szReason)
 		icq_sendAuthResponseServ(uin, uid, 0, szReason);

 

 		if (db_get_b(hContact, "CList", "NotOnList", 0))

-			CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0);

+			CallService(MS_DB_CONTACT_DELETE, hContact, 0);

 

 		return 0; // Success

 	}

@@ -1000,7 +1000,7 @@ int __cdecl CIcqProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)
 

 	// stop contact from typing - some clients do not sent stop notify

 	if (CheckContactCapabilities(hContact, CAPF_TYPING))

-		CallService(MS_PROTO_CONTACTISTYPING, (WPARAM)hContact, PROTOTYPE_CONTACTTYPING_OFF);

+		CallService(MS_PROTO_CONTACTISTYPING, hContact, PROTOTYPE_CONTACTTYPING_OFF);

 

 	return 0;

 }

diff --git a/protocols/IcqOscarJ/src/icq_servlist.cpp b/protocols/IcqOscarJ/src/icq_servlist.cpp
index dd0bdaa3ee..ae2497dabe 100644
--- a/protocols/IcqOscarJ/src/icq_servlist.cpp
+++ b/protocols/IcqOscarJ/src/icq_servlist.cpp
@@ -1583,7 +1583,7 @@ int CIcqProto::moveContactToCListGroup(MCONTACT hContact, const char *szGroup)
 	HANDLE hGroup = Clist_CreateGroup(0, ptrT( mir_utf8decodeT(szGroup)));

 

 	if (ServiceExists(MS_CLIST_CONTACTCHANGEGROUP))

-		return CallService(MS_CLIST_CONTACTCHANGEGROUP, (WPARAM)hContact, (LPARAM)hGroup);

+		return CallService(MS_CLIST_CONTACTCHANGEGROUP, hContact, (LPARAM)hGroup);

 	else /// TODO: is this neccessary ?

 		return db_set_utf(hContact, "CList", "Group", szGroup);

 }

diff --git a/protocols/IcqOscarJ/src/icq_uploadui.cpp b/protocols/IcqOscarJ/src/icq_uploadui.cpp
index 9f6a5d2080..5dbeef6d8e 100644
--- a/protocols/IcqOscarJ/src/icq_uploadui.cpp
+++ b/protocols/IcqOscarJ/src/icq_uploadui.cpp
@@ -65,7 +65,7 @@ static void UpdateAllContactsCheckmark(HWND hwndList, CIcqProto* ppro, HANDLE ph
 	MCONTACT hContact = ppro->FindFirstContact();

 	while (hContact)

 	{

-		HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0);

+		HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, hContact, 0);

 		if (hItem)

 		{

 			if (!SendMessage(hwndList, CLM_GETCHECKMARK, (WPARAM)hItem, 0))

@@ -90,7 +90,7 @@ static int UpdateCheckmarks(HWND hwndList, CIcqProto* ppro, HANDLE phItemAll)
 	MCONTACT hContact = ppro->FindFirstContact();

 	while (hContact)

 	{

-		HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0);

+		HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, hContact, 0);

 		if (hItem)

 		{

 			if (ppro->getWord(hContact, DBSETTING_SERVLIST_ID, 0))

@@ -113,7 +113,7 @@ static int UpdateCheckmarks(HWND hwndList, CIcqProto* ppro, HANDLE phItemAll)
 static void DeleteOtherContactsFromControl(HWND hCtrl, CIcqProto* ppro)

 {

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

-		HANDLE hItem = (HANDLE)SendMessage(hCtrl, CLM_FINDCONTACT, (WPARAM)hContact, 0);

+		HANDLE hItem = (HANDLE)SendMessage(hCtrl, CLM_FINDCONTACT, hContact, 0);

 		if (hItem)

 			if (!ppro->IsICQContact(hContact))

 				SendMessage(hCtrl, CLM_DELETEITEM, (WPARAM)hItem, 0);

@@ -551,7 +551,7 @@ static INT_PTR CALLBACK DlgProcUploadList(HWND hwndDlg,UINT message,WPARAM wPara
 				{

 					hCurrentContact = hContact;

 

-					hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0);

+					hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, hContact, 0);

 					if (hItem)

 					{

 						isChecked = SendMessage(hwndList, CLM_GETCHECKMARK, (WPARAM)hItem, 0) != 0;

@@ -947,7 +947,7 @@ static INT_PTR CALLBACK DlgProcUploadList(HWND hwndDlg,UINT message,WPARAM wPara
 							hContact = ppro->FindFirstContact();

 							while (hContact)

 							{

-								hItem = (HANDLE)SendMessage(hClist, CLM_FINDCONTACT, (WPARAM)hContact, 0);

+								hItem = (HANDLE)SendMessage(hClist, CLM_FINDCONTACT, hContact, 0);

 								if (hItem)

 									SendMessage(hClist, CLM_SETCHECKMARK, (WPARAM)hItem, check);

 								hContact = ppro->FindNextContact(hContact);

diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp
index deafab4806..521a64f4fe 100644
--- a/protocols/IcqOscarJ/src/utilities.cpp
+++ b/protocols/IcqOscarJ/src/utilities.cpp
@@ -475,9 +475,9 @@ MCONTACT CIcqProto::HContactFromUIN(DWORD dwUin, int *Added)
 			return INVALID_CONTACT_ID;

 		}

 

-		if (CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)m_szModuleName) != 0) {

+		if (CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)m_szModuleName) != 0) {

 			// For some reason we failed to register the protocol to this contact

-			CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0);

+			CallService(MS_DB_CONTACT_DELETE, hContact, 0);

 			debugLogA("Failed to register ICQ contact %u", dwUin);

 			return INVALID_CONTACT_ID;

 		}

@@ -541,7 +541,7 @@ MCONTACT CIcqProto::HContactFromUID(DWORD dwUin, const char *szUid, int *Added)
 	//not present: add

 	if (Added) {

 		hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);

-		CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)m_szModuleName);

+		CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)m_szModuleName);

 

 		setString(hContact, UNIQUEIDSETTING, szUid);

 

@@ -589,7 +589,7 @@ char *NickFromHandle(MCONTACT hContact)
 	if (hContact == INVALID_CONTACT_ID)

 		return null_strdup(Translate("<invalid>"));

 

-	return null_strdup((char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, 0));

+	return null_strdup((char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, 0));

 }

 

 char *NickFromHandleUtf(MCONTACT hContact)

@@ -597,7 +597,7 @@ char *NickFromHandleUtf(MCONTACT hContact)
 	if (hContact == INVALID_CONTACT_ID)

 		return ICQTranslateUtf(LPGEN("<invalid>"));

 

-	return tchar_to_utf8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR));

+	return tchar_to_utf8((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR));

 }

 

 char *strUID(DWORD dwUIN, char *pszUID)