these conversions aren't needed either

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

9 files changed, 37 insertions, 37 deletions

diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp
index 2e0df413f3..052f2d9692 100644
--- a/protocols/JabberG/src/jabber_adhoc.cpp
+++ b/protocols/JabberG/src/jabber_adhoc.cpp
@@ -510,7 +510,7 @@ static INT_PTR CALLBACK JabberAdHoc_CommandDlgProc(HWND hwndDlg, UINT msg, WPARA
 

 int __cdecl CJabberProto::ContactMenuRunCommands(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	int res = -1;

 

 	if ((hContact != NULL || lParam != 0) && m_bJabberOnline) {

diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp
index 4fb8a4a3c1..594224512b 100644
--- a/protocols/JabberG/src/jabber_events.cpp
+++ b/protocols/JabberG/src/jabber_events.cpp
@@ -36,7 +36,7 @@ int CJabberProto::OnContactDeleted(WPARAM wParam, LPARAM)
 	if (!m_bJabberOnline)	// should never happen

 		return 0;

 

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	ptrT jid(getTStringA(hContact, isChatRoom(hContact) ? "ChatRoomID" : "jid"));

 	if (jid == NULL)

 		return 0;

@@ -159,7 +159,7 @@ void __cdecl CJabberProto::OnAddContactForever(DBCONTACTWRITESETTING *cws, MCONT
 

 int __cdecl CJabberProto::OnDbSettingChanged(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (hContact == NULL || !m_bJabberOnline)

 		return 0;

 

diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index bbf4cae4f7..0e8d20f019 100644
--- a/protocols/JabberG/src/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
@@ -185,7 +185,7 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleJoinGroupchat(WPARAM, LPARAM)
 

 INT_PTR __cdecl CJabberProto::OnJoinChat(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	ptrT jid( getTStringA(hContact, "ChatRoomID"));

 	if (jid == NULL)

 		return 0;

@@ -210,7 +210,7 @@ INT_PTR __cdecl CJabberProto::OnJoinChat(WPARAM wParam, LPARAM)
 

 INT_PTR __cdecl CJabberProto::OnLeaveChat(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	ptrT jid(getTStringA(hContact, "ChatRoomID"));

 	if (jid != NULL) {

 		if (getWord(hContact, "Status", 0) != ID_STATUS_OFFLINE) {

diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index 53491363bd..b535cb0d47 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -393,7 +393,7 @@ int CJabberProto::OnReloadIcons(WPARAM, LPARAM)
 

 INT_PTR __cdecl CJabberProto::JGetAdvancedStatusIcon(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (!hContact)

 		return -1;

 

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index c816f155e1..066a03f2a1 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -88,73 +88,73 @@ static CJabberProto* JabberGetInstanceByHContact(MCONTACT hContact)
 

 static INT_PTR JabberMenuHandleRequestAuth(WPARAM wParam, LPARAM lParam)

 {

-	CJabberProto *ppro = JabberGetInstanceByHContact((MCONTACT)wParam);

+	CJabberProto *ppro = JabberGetInstanceByHContact(wParam);

 	return(ppro) ? ppro->OnMenuHandleRequestAuth(wParam, lParam) : 0;

 }

 

 static INT_PTR JabberMenuHandleGrantAuth(WPARAM wParam, LPARAM lParam)

 {

-	CJabberProto *ppro = JabberGetInstanceByHContact((MCONTACT)wParam);

+	CJabberProto *ppro = JabberGetInstanceByHContact(wParam);

 	return(ppro) ? ppro->OnMenuHandleGrantAuth(wParam, lParam) : 0;

 }

 

 static INT_PTR JabberMenuRevokeAuth(WPARAM wParam, LPARAM lParam)

 {

-	CJabberProto *ppro = JabberGetInstanceByHContact((MCONTACT)wParam);

+	CJabberProto *ppro = JabberGetInstanceByHContact(wParam);

 	return(ppro) ? ppro->OnMenuRevokeAuth(wParam, lParam) : 0;

 }

 

 static INT_PTR JabberMenuConvertChatContact(WPARAM wParam, LPARAM lParam)

 {

-	CJabberProto *ppro = JabberGetInstanceByHContact((MCONTACT)wParam);

+	CJabberProto *ppro = JabberGetInstanceByHContact(wParam);

 	return(ppro) ? ppro->OnMenuConvertChatContact(wParam, lParam) : 0;

 }

 

 static INT_PTR JabberMenuRosterAdd(WPARAM wParam, LPARAM lParam)

 {

-	CJabberProto *ppro = JabberGetInstanceByHContact((MCONTACT)wParam);

+	CJabberProto *ppro = JabberGetInstanceByHContact(wParam);

 	return(ppro) ? ppro->OnMenuRosterAdd(wParam, lParam) : 0;

 }

 

 static INT_PTR JabberMenuBookmarkAdd(WPARAM wParam, LPARAM lParam)

 {

-	CJabberProto *ppro = JabberGetInstanceByHContact((MCONTACT)wParam);

+	CJabberProto *ppro = JabberGetInstanceByHContact(wParam);

 	return(ppro) ? ppro->OnMenuBookmarkAdd(wParam, lParam) : 0;

 }

 

 static INT_PTR JabberMenuTransportLogin(WPARAM wParam, LPARAM lParam)

 {

-	CJabberProto *ppro = JabberGetInstanceByHContact((MCONTACT)wParam);

+	CJabberProto *ppro = JabberGetInstanceByHContact(wParam);

 	return(ppro) ? ppro->OnMenuTransportLogin(wParam, lParam) : 0;

 }

 

 static INT_PTR JabberMenuTransportResolve(WPARAM wParam, LPARAM lParam)

 {

-	CJabberProto *ppro = JabberGetInstanceByHContact((MCONTACT)wParam);

+	CJabberProto *ppro = JabberGetInstanceByHContact(wParam);

 	return(ppro) ? ppro->OnMenuTransportResolve(wParam, lParam) : 0;

 }

 

 static INT_PTR JabberContactMenuRunCommands(WPARAM wParam, LPARAM lParam)

 {

-	CJabberProto *ppro = JabberGetInstanceByHContact((MCONTACT)wParam);

+	CJabberProto *ppro = JabberGetInstanceByHContact(wParam);

 	return(ppro) ? ppro->ContactMenuRunCommands(wParam, lParam) : 0;

 }

 

 static INT_PTR JabberMenuSendNote(WPARAM wParam, LPARAM lParam)

 {

-	CJabberProto *ppro = JabberGetInstanceByHContact((MCONTACT)wParam);

+	CJabberProto *ppro = JabberGetInstanceByHContact(wParam);

 	return(ppro) ? ppro->OnMenuSendNote(wParam, lParam) : 0;

 }

 

 static INT_PTR JabberMenuHandleResource(WPARAM wParam, LPARAM lParam, LPARAM lRes)

 {

-	CJabberProto *ppro = JabberGetInstanceByHContact((MCONTACT)wParam);

+	CJabberProto *ppro = JabberGetInstanceByHContact(wParam);

 	return(ppro) ? ppro->OnMenuHandleResource(wParam, lParam, lRes) : 0;

 }

 

 static INT_PTR JabberMenuHandleDirectPresence(WPARAM wParam, LPARAM lParam, LPARAM lRes)

 {

-	CJabberProto *ppro = JabberGetInstanceByHContact((MCONTACT)wParam);

+	CJabberProto *ppro = JabberGetInstanceByHContact(wParam);

 	return(ppro) ? ppro->OnMenuHandleDirectPresence(wParam, lParam, lRes) : 0;

 }

 

@@ -173,7 +173,7 @@ static int JabberPrebuildContactMenu(WPARAM wParam, LPARAM lParam)
 	Menu_ShowItem(g_hMenuResourcesRoot, FALSE);

 	Menu_ShowItem(g_hMenuDirectPresence[0], FALSE);

 

-	CJabberProto *ppro = JabberGetInstanceByHContact((MCONTACT)wParam);

+	CJabberProto *ppro = JabberGetInstanceByHContact(wParam);

 	return(ppro) ? ppro->OnPrebuildContactMenu(wParam, lParam) : 0;

 }

 

@@ -347,7 +347,7 @@ void g_MenuUninit(void)
 

 int CJabberProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (hContact == NULL)

 		return 0;

 

@@ -479,7 +479,7 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)
 

 INT_PTR __cdecl CJabberProto::OnMenuConvertChatContact(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	BYTE bIsChatRoom = isChatRoom(hContact);

 	const char *szSetting = (bIsChatRoom) ? "ChatRoomID" : "jid";

 

@@ -494,7 +494,7 @@ INT_PTR __cdecl CJabberProto::OnMenuConvertChatContact(WPARAM wParam, LPARAM)
 

 INT_PTR __cdecl CJabberProto::OnMenuRosterAdd(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (!hContact)

 		return 0; // we do not add ourself to the roster. (buggy situation - should not happen)

 

@@ -524,7 +524,7 @@ INT_PTR __cdecl CJabberProto::OnMenuRosterAdd(WPARAM wParam, LPARAM)
 

 INT_PTR __cdecl CJabberProto::OnMenuHandleRequestAuth(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (hContact != NULL && m_bJabberOnline) {

 		ptrT jid(getTStringA(hContact, "jid"));

 		if (jid != NULL)

@@ -535,7 +535,7 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleRequestAuth(WPARAM wParam, LPARAM)
 

 INT_PTR __cdecl CJabberProto::OnMenuHandleGrantAuth(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (hContact != NULL && m_bJabberOnline) {

 		ptrT jid(getTStringA(hContact, "jid"));

 		if (jid != NULL)

@@ -546,7 +546,7 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleGrantAuth(WPARAM wParam, LPARAM)
 

 INT_PTR __cdecl CJabberProto::OnMenuRevokeAuth(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (hContact != NULL && m_bJabberOnline) {

 		ptrT jid(getTStringA(hContact, "jid"));

 		if (jid != NULL)

@@ -557,7 +557,7 @@ INT_PTR __cdecl CJabberProto::OnMenuRevokeAuth(WPARAM wParam, LPARAM)
 

 INT_PTR __cdecl CJabberProto::OnMenuTransportLogin(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (!getByte(hContact, "IsTransport", 0))

 		return 0;

 

@@ -573,7 +573,7 @@ INT_PTR __cdecl CJabberProto::OnMenuTransportLogin(WPARAM wParam, LPARAM)
 

 INT_PTR __cdecl CJabberProto::OnMenuTransportResolve(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (!getByte(hContact, "IsTransport", 0))

 		return 0;

 

@@ -585,7 +585,7 @@ INT_PTR __cdecl CJabberProto::OnMenuTransportResolve(WPARAM wParam, LPARAM)
 

 INT_PTR __cdecl CJabberProto::OnMenuBookmarkAdd(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (!hContact)

 		return 0; // we do not add ourself to the roster. (buggy situation - should not happen)

 

@@ -1043,7 +1043,7 @@ int CJabberProto::OnProcessSrmmIconClick(WPARAM wParam, LPARAM lParam)
 	if (lstrcmpA(sicd->szModule, m_szModuleName))

 		return 0;

 

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (!hContact)

 		return 0;

 

@@ -1097,7 +1097,7 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleResource(WPARAM wParam, LPARAM, LPARAM
 	if (!m_bJabberOnline || !wParam)

 		return 0;

 

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	ptrT tszJid(getTStringA(hContact, "jid"));

 	if (tszJid == NULL)

 		return 0;

@@ -1129,7 +1129,7 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleDirectPresence(WPARAM wParam, LPARAM l
 	if (!m_bJabberOnline || !wParam)

 		return 0;

 

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 

 	TCHAR *jid, text[1024];

 	ptrT tszJid(getTStringA(hContact, "jid"));

diff --git a/protocols/JabberG/src/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp
index 9a9f88f1b0..101a9cfa00 100644
--- a/protocols/JabberG/src/jabber_notes.cpp
+++ b/protocols/JabberG/src/jabber_notes.cpp
@@ -813,7 +813,7 @@ INT_PTR __cdecl CJabberProto::OnMenuHandleNotes(WPARAM, LPARAM)
 INT_PTR __cdecl CJabberProto::OnMenuSendNote(WPARAM wParam, LPARAM)

 {

 	if (wParam) {

-		CNoteItem *pItem = new CNoteItem(NULL, ptrT(getTStringA((MCONTACT)wParam, "jid")));

+		CNoteItem *pItem = new CNoteItem(NULL, ptrT(getTStringA(wParam, "jid")));

 		CJabberDlgBase *pDlg = new CJabberDlgNoteItem(this, pItem, &CJabberProto::ProcessOutgoingNote);

 		pDlg->Show();

 	}

diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp
index d1e828ea2c..442cf5d0e4 100644
--- a/protocols/JabberG/src/jabber_svc.cpp
+++ b/protocols/JabberG/src/jabber_svc.cpp
@@ -538,7 +538,7 @@ INT_PTR __cdecl CJabberProto::JabberSendNudge(WPARAM wParam, LPARAM)
 	if (!m_bJabberOnline)

 		return 0;

 

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	ptrT jid( getTStringA(hContact, "jid"));

 	if (jid == NULL)

 		return 0;

diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp
index 68eaaf10c0..b526048f78 100644
--- a/protocols/JabberG/src/jabber_userinfo.cpp
+++ b/protocols/JabberG/src/jabber_userinfo.cpp
@@ -445,7 +445,7 @@ static INT_PTR CALLBACK JabberUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 		dat->resourcesCount = -1;

 

 		if (CallService(MS_DB_CONTACT_IS, (WPARAM)lParam, 0))

-			dat->hContact = (MCONTACT)lParam;

+			dat->hContact = lParam;

 		else if (!IsBadReadPtr((void*)lParam, sizeof(JABBER_LIST_ITEM))) {

 			dat->hContact = NULL;

 			dat->item = (JABBER_LIST_ITEM *)lParam;

@@ -605,7 +605,7 @@ static INT_PTR CALLBACK JabberUserPhotoDlgProc(HWND hwndDlg, UINT msg, WPARAM wP
 		// lParam is hContact

 		TranslateDialogDefault(hwndDlg);

 		photoInfo = (USER_PHOTO_INFO *) mir_alloc(sizeof(USER_PHOTO_INFO));

-		photoInfo->hContact = (MCONTACT)lParam;

+		photoInfo->hContact = lParam;

 		photoInfo->ppro = NULL;

 		photoInfo->hBitmap = NULL;

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

@@ -800,7 +800,7 @@ int CJabberProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam)
 	if (!CallService(MS_PROTO_ISPROTOCOLLOADED, 0, (LPARAM)m_szModuleName))

 		return 0;

 

-	MCONTACT hContact = (MCONTACT)lParam;

+	MCONTACT hContact = lParam;

 	if (hContact == NULL) {

 		// Show our vcard

 		OnUserInfoInit_VCard(wParam, lParam);

diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index 4843701d63..d5ac96a819 100644
--- a/protocols/JabberG/src/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
@@ -1342,7 +1342,7 @@ INT_PTR __cdecl CJabberProto::OnGetXStatusEx(WPARAM wParam, LPARAM lParam)
 	if (pepMood == NULL)

 		return 1;

 

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 

 	// fill status member

 	if (pData->flags & CSSF_MASK_STATUS)