these conversions aren't needed either

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

6 files changed, 30 insertions, 30 deletions

diff --git a/protocols/IcqOscarJ/src/UI/askauthentication.cpp b/protocols/IcqOscarJ/src/UI/askauthentication.cpp
index 91fe8e75d2..be0b18af78 100644
--- a/protocols/IcqOscarJ/src/UI/askauthentication.cpp
+++ b/protocols/IcqOscarJ/src/UI/askauthentication.cpp
@@ -90,7 +90,7 @@ static INT_PTR CALLBACK AskAuthProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 INT_PTR CIcqProto::RequestAuthorization(WPARAM wParam, LPARAM lParam)

 {

-	AskAuthParam param = { this, (MCONTACT)wParam };

+	AskAuthParam param = { this, wParam };

 	DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_ASKAUTH), NULL, AskAuthProc, (LPARAM)&param);

 	return 0;

 }

diff --git a/protocols/IcqOscarJ/src/UI/userinfotab.cpp b/protocols/IcqOscarJ/src/UI/userinfotab.cpp
index 793aa0d04d..a70d2d49e5 100644
--- a/protocols/IcqOscarJ/src/UI/userinfotab.cpp
+++ b/protocols/IcqOscarJ/src/UI/userinfotab.cpp
@@ -284,7 +284,7 @@ static INT_PTR CALLBACK IcqDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 int CIcqProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam)

 {

-	if ((!IsICQContact((MCONTACT)lParam)) && lParam)

+	if ((!IsICQContact(lParam)) && lParam)

 		return 0;

 

 	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

diff --git a/protocols/IcqOscarJ/src/icq_menu.cpp b/protocols/IcqOscarJ/src/icq_menu.cpp
index f06e5eea20..b23bed9fd5 100644
--- a/protocols/IcqOscarJ/src/icq_menu.cpp
+++ b/protocols/IcqOscarJ/src/icq_menu.cpp
@@ -54,37 +54,37 @@ static CIcqProto* IcqGetInstanceByHContact(MCONTACT hContact)
 

 static INT_PTR IcqMenuHandleRequestAuth(WPARAM wParam, LPARAM lParam)

 {

-	CIcqProto* ppro = IcqGetInstanceByHContact((MCONTACT)wParam);

+	CIcqProto* ppro = IcqGetInstanceByHContact(wParam);

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

 }

 

 static INT_PTR IcqMenuHandleGrantAuth(WPARAM wParam, LPARAM lParam)

 {

-	CIcqProto* ppro = IcqGetInstanceByHContact((MCONTACT)wParam);

+	CIcqProto* ppro = IcqGetInstanceByHContact(wParam);

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

 }

 

 static INT_PTR IcqMenuHandleRevokeAuth(WPARAM wParam, LPARAM lParam)

 {

-	CIcqProto* ppro = IcqGetInstanceByHContact((MCONTACT)wParam);

+	CIcqProto* ppro = IcqGetInstanceByHContact(wParam);

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

 }

 

 static INT_PTR IcqMenuHandleAddServContact(WPARAM wParam, LPARAM lParam)

 {

-	CIcqProto* ppro = IcqGetInstanceByHContact((MCONTACT)wParam);

+	CIcqProto* ppro = IcqGetInstanceByHContact(wParam);

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

 }

 

 static INT_PTR IcqMenuHandleXStatusDetails(WPARAM wParam, LPARAM lParam)

 {

-	CIcqProto* ppro = IcqGetInstanceByHContact((MCONTACT)wParam);

+	CIcqProto* ppro = IcqGetInstanceByHContact(wParam);

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

 }

 

 static INT_PTR IcqMenuHandleOpenProfile(WPARAM wParam, LPARAM lParam)

 {

-	CIcqProto* ppro = IcqGetInstanceByHContact((MCONTACT)wParam);

+	CIcqProto* ppro = IcqGetInstanceByHContact(wParam);

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

 }

 

@@ -97,7 +97,7 @@ static int IcqPrebuildContactMenu( WPARAM wParam, LPARAM lParam )
 	Menu_ShowItem(g_hContactMenuItems[ICMI_XSTATUS_DETAILS], FALSE);

 	Menu_ShowItem(g_hContactMenuItems[ICMI_OPEN_PROFILE], FALSE);

 

-	CIcqProto* ppro = IcqGetInstanceByHContact((MCONTACT)wParam);

+	CIcqProto* ppro = IcqGetInstanceByHContact(wParam);

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

 }

 

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

 INT_PTR CIcqProto::OpenWebProfile(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	DWORD dwUin = getContactUin(hContact);

 	char url[256];

 	mir_snprintf(url, sizeof(url), "http://www.icq.com/people/%d",dwUin);

@@ -187,7 +187,7 @@ INT_PTR CIcqProto::OpenWebProfile(WPARAM wParam, LPARAM lParam)
 

 int CIcqProto::OnPreBuildContactMenu(WPARAM wParam, LPARAM)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	if (hContact == NULL)

 		return 0;

 

diff --git a/protocols/IcqOscarJ/src/icq_servlist.cpp b/protocols/IcqOscarJ/src/icq_servlist.cpp
index e103094c57..71745e80a6 100644
--- a/protocols/IcqOscarJ/src/icq_servlist.cpp
+++ b/protocols/IcqOscarJ/src/icq_servlist.cpp
@@ -2593,14 +2593,14 @@ int CIcqProto::ServListDbSettingChanged(WPARAM wParam, LPARAM lParam)
 		if (!strcmpnull(cws->szSetting, "MyHandle") &&

 			getByte("StoreServerDetails", DEFAULT_SS_STORE))

 		{ // Update contact's details in server-list

-			servlistUpdateContact((MCONTACT)wParam);

+			servlistUpdateContact(wParam);

 		}

 

 		// Has contact been moved to another group?

 		if (!strcmpnull(cws->szSetting, "Group") &&

 			getByte("StoreServerDetails", DEFAULT_SS_STORE))

 		{ // Read group from DB

-			char* szNewGroup = getContactCListGroup((MCONTACT)wParam);

+			char* szNewGroup = getContactCListGroup(wParam);

 

 			SAFE_FREE(&szNewGroup);

 		}

@@ -2610,7 +2610,7 @@ int CIcqProto::ServListDbSettingChanged(WPARAM wParam, LPARAM lParam)
 		if (!strcmpnull(cws->szSetting, "MyNotes") &&

 			getByte("StoreServerDetails", DEFAULT_SS_STORE))

 		{ // Update contact's details in server-list

-			servlistUpdateContact((MCONTACT)wParam);

+			servlistUpdateContact(wParam);

 		}

 	}

 

@@ -2624,17 +2624,17 @@ int CIcqProto::ServListDbContactDeleted(WPARAM wParam, LPARAM lParam)
 	debugLogA("DB-Events: Contact %x deleted.", wParam);

 #endif

 

-	DeleteFromContactsCache((MCONTACT)wParam);

+	DeleteFromContactsCache(wParam);

 

 	if ( !icqOnline() && m_bSsiEnabled)

 	{ // contact was deleted only locally - retrieve full list on next connect

-		setWord((MCONTACT)wParam, "SrvRecordCount", 0);

+		setWord(wParam, "SrvRecordCount", 0);

 	}

 

 	if ( !icqOnline() || !m_bSsiEnabled)

 		return 0;

 

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 

 	// we need all server contacts on local buddy list

 	DWORD dwUIN;

@@ -2674,7 +2674,7 @@ int CIcqProto::ServListDbContactDeleted(WPARAM wParam, LPARAM lParam)
 

 int CIcqProto::ServListCListGroupChange(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 	CLISTGROUPCHANGE *grpchg = (CLISTGROUPCHANGE*)lParam;

 

 	if (!icqOnline() || !m_bSsiEnabled || bIsSyncingCL)

diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp
index 231293a139..4f14141bc0 100644
--- a/protocols/IcqOscarJ/src/icq_xstatus.cpp
+++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp
@@ -912,7 +912,7 @@ INT_PTR CIcqProto::ShowXStatusDetails(WPARAM wParam, LPARAM lParam)
 	InitXStatusData init;

 	init.ppro = this;

 	init.bAction = 1; // retrieve

-	init.hContact = (MCONTACT)wParam;

+	init.hContact = wParam;

 	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SETXSTATUS), NULL, SetXStatusDlgProc, (LPARAM)&init);

 

 	return 0;

@@ -971,7 +971,7 @@ INT_PTR CIcqProto::SetXStatusEx(WPARAM wParam, LPARAM lParam)
 INT_PTR CIcqProto::GetXStatusEx(WPARAM wParam, LPARAM lParam)

 {

 	CUSTOM_STATUS *pData = (CUSTOM_STATUS*)lParam;

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 

 	if (!m_bXStatusEnabled && !m_bMoodsEnabled) return 1;

 

@@ -1088,7 +1088,7 @@ INT_PTR CIcqProto::GetXStatusIcon(WPARAM wParam, LPARAM lParam)
 

 INT_PTR CIcqProto::RequestXStatusDetails(WPARAM wParam, LPARAM lParam)

 {

-	MCONTACT hContact = (MCONTACT)wParam;

+	MCONTACT hContact = wParam;

 

 	if (!m_bXStatusEnabled)

 		return 0;

@@ -1105,7 +1105,7 @@ INT_PTR CIcqProto::RequestAdvStatusIconIdx(WPARAM wParam, LPARAM lParam)
 	if (!m_bXStatusEnabled && !m_bMoodsEnabled)

 		return -1;

 

-	BYTE bXStatus = getContactXStatus((MCONTACT)wParam);

+	BYTE bXStatus = getContactXStatus(wParam);

 	if (bXStatus) {

 		if (!bXStatusCListIconsValid[bXStatus-1]) { // adding icon

 			int idx = hXStatusCListIcons[bXStatus-1]; 

diff --git a/protocols/IcqOscarJ/src/icqosc_svcs.cpp b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
index 69df16b526..d70f103374 100644
--- a/protocols/IcqOscarJ/src/icqosc_svcs.cpp
+++ b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
@@ -38,12 +38,12 @@ INT_PTR CIcqProto::AddServerContact(WPARAM wParam, LPARAM lParam)
 	if (!m_bSsiEnabled) return 0;

 

 	// Does this contact have a UID?

-	if (!getContactUid((MCONTACT)wParam, &dwUin, &szUid) && !getWord((MCONTACT)wParam, DBSETTING_SERVLIST_ID, 0) && !getWord((MCONTACT)wParam, DBSETTING_SERVLIST_IGNORE, 0))

+	if (!getContactUid(wParam, &dwUin, &szUid) && !getWord(wParam, DBSETTING_SERVLIST_ID, 0) && !getWord(wParam, DBSETTING_SERVLIST_IGNORE, 0))

 	{ /// TODO: remove possible 0x6A TLV in contact server-list data!!!

 		// Read group from DB

-		char *pszGroup = getContactCListGroup((MCONTACT)wParam);

+		char *pszGroup = getContactCListGroup(wParam);

 

-		servlistAddContact((MCONTACT)wParam, pszGroup);

+		servlistAddContact(wParam, pszGroup);

 		SAFE_FREE((void**)&pszGroup);

 	}

 	return 0;

@@ -88,7 +88,7 @@ INT_PTR CIcqProto::GetInfoSetting(WPARAM wParam, LPARAM lParam)
 {

 	DBCONTACTGETSETTING *cgs = (DBCONTACTGETSETTING*)lParam;

 	BYTE type = cgs->pValue->type;

-	INT_PTR rc = db_get_s((MCONTACT)wParam, cgs->szModule, cgs->szSetting, cgs->pValue, 0);

+	INT_PTR rc = db_get_s(wParam, cgs->szModule, cgs->szSetting, cgs->pValue, 0);

 	if (rc)

 		return rc;

 	

@@ -458,13 +458,13 @@ INT_PTR CIcqProto::GrantAuthorization(WPARAM wParam, LPARAM lParam)
 		DWORD dwUin;

 		uid_str szUid;

 

-		if (getContactUid((MCONTACT)wParam, &dwUin, &szUid))

+		if (getContactUid(wParam, &dwUin, &szUid))

 			return 0; // Invalid contact

 

 		// send without reason, do we need any ?

 		icq_sendGrantAuthServ(dwUin, szUid, NULL);

 		// auth granted, remove contact menu item

-		delSetting((MCONTACT)wParam, "Grant");

+		delSetting(wParam, "Grant");

 	}

 

 	return 0;

@@ -494,7 +494,7 @@ INT_PTR CIcqProto::RevokeAuthorization(WPARAM wParam, LPARAM lParam)
 		DWORD dwUin;

 		uid_str szUid;

 

-		if (getContactUid((MCONTACT)wParam, &dwUin, &szUid))

+		if (getContactUid(wParam, &dwUin, &szUid))

 			return 0; // Invalid contact

 

 		if (MessageBox(NULL, TranslateT("Are you sure you want to revoke user's authorization?\nThis will remove you from his/her list on some clients."), TranslateT("Confirmation"), MB_ICONQUESTION | MB_YESNO) != IDYES)

@@ -714,7 +714,7 @@ INT_PTR __cdecl CIcqProto::IcqCheckCapability(WPARAM wParam, LPARAM lParam)
 {

     int res = 0;

     DBVARIANT dbvariant;

-	 MCONTACT hContact = (MCONTACT)wParam;

+	 MCONTACT hContact = wParam;

     ICQ_CUSTOMCAP *icqCustomCap = (ICQ_CUSTOMCAP *)lParam;

 

 	 db_get(hContact, m_szModuleName, "CapBuf", &dbvariant);