4 files changed, 18 insertions, 27 deletions
diff --git a/protocols/IcqOscarJ/src/icq_menu.cpp b/protocols/IcqOscarJ/src/icq_menu.cpp
index b23bed9fd5..473629a4d3 100644
--- a/protocols/IcqOscarJ/src/icq_menu.cpp
+++ b/protocols/IcqOscarJ/src/icq_menu.cpp
@@ -175,9 +175,8 @@ void g_MenuUninit(void)
 }
 
 
-INT_PTR CIcqProto::OpenWebProfile(WPARAM wParam, LPARAM lParam)
+INT_PTR CIcqProto::OpenWebProfile(WPARAM hContact, LPARAM lParam)
 {
-	MCONTACT hContact = wParam;
 	DWORD dwUin = getContactUin(hContact);
 	char url[256];
 	mir_snprintf(url, sizeof(url), "http://www.icq.com/people/%d",dwUin);
@@ -185,9 +184,8 @@ INT_PTR CIcqProto::OpenWebProfile(WPARAM wParam, LPARAM lParam)
 }
 
 
-int CIcqProto::OnPreBuildContactMenu(WPARAM wParam, LPARAM)
+int CIcqProto::OnPreBuildContactMenu(WPARAM hContact, LPARAM)
 {
-	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 71745e80a6..dd0bdaa3ee 100644
--- a/protocols/IcqOscarJ/src/icq_servlist.cpp
+++ b/protocols/IcqOscarJ/src/icq_servlist.cpp
@@ -2618,24 +2618,21 @@ int CIcqProto::ServListDbSettingChanged(WPARAM wParam, LPARAM lParam)
 }
 
 
-int CIcqProto::ServListDbContactDeleted(WPARAM wParam, LPARAM lParam)
+int CIcqProto::ServListDbContactDeleted(WPARAM hContact, LPARAM lParam)
 {
 #ifdef _DEBUG
-	debugLogA("DB-Events: Contact %x deleted.", wParam);
+	debugLogA("DB-Events: Contact %x deleted.", hContact);
 #endif
 
-	DeleteFromContactsCache(wParam);
+	DeleteFromContactsCache(hContact);
 
 	if ( !icqOnline() && m_bSsiEnabled)
-	{ // contact was deleted only locally - retrieve full list on next connect
-		setWord(wParam, "SrvRecordCount", 0);
-	}
+		// contact was deleted only locally - retrieve full list on next connect
+		setWord(hContact, "SrvRecordCount", 0);
 
 	if ( !icqOnline() || !m_bSsiEnabled)
 		return 0;
 
-	MCONTACT hContact = wParam;
-
 	// we need all server contacts on local buddy list
 	DWORD dwUIN;
 	uid_str szUID;
@@ -2672,9 +2669,8 @@ int CIcqProto::ServListDbContactDeleted(WPARAM wParam, LPARAM lParam)
 }
 
 
-int CIcqProto::ServListCListGroupChange(WPARAM wParam, LPARAM lParam)
+int CIcqProto::ServListCListGroupChange(WPARAM hContact, LPARAM lParam)
 {
-	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 4f14141bc0..07490019c1 100644
--- a/protocols/IcqOscarJ/src/icq_xstatus.cpp
+++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp
@@ -907,12 +907,12 @@ void InitXStatusIcons()
 	memset(hXStatusCListIcons, -1, sizeof(hXStatusCListIcons));
 }
 
-INT_PTR CIcqProto::ShowXStatusDetails(WPARAM wParam, LPARAM lParam)
+INT_PTR CIcqProto::ShowXStatusDetails(WPARAM hContact, LPARAM lParam)
 {
 	InitXStatusData init;
 	init.ppro = this;
 	init.bAction = 1; // retrieve
-	init.hContact = wParam;
+	init.hContact = hContact;
 	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_SETXSTATUS), NULL, SetXStatusDlgProc, (LPARAM)&init);
 
 	return 0;
@@ -968,14 +968,14 @@ INT_PTR CIcqProto::SetXStatusEx(WPARAM wParam, LPARAM lParam)
 	return 0; // Success
 }
 
-INT_PTR CIcqProto::GetXStatusEx(WPARAM wParam, LPARAM lParam)
+INT_PTR CIcqProto::GetXStatusEx(WPARAM hContact, LPARAM lParam)
 {
-	CUSTOM_STATUS *pData = (CUSTOM_STATUS*)lParam;
-	MCONTACT hContact = wParam;
-
-	if (!m_bXStatusEnabled && !m_bMoodsEnabled) return 1;
+	if (!m_bXStatusEnabled && !m_bMoodsEnabled)
+		return 1;
 
-	if (pData->cbSize < sizeof(CUSTOM_STATUS)) return 1; // Failure
+	CUSTOM_STATUS *pData = (CUSTOM_STATUS*)lParam;
+	if (pData->cbSize < sizeof(CUSTOM_STATUS))
+		return 1; // Failure
 
 	// fill status member
 	if (pData->flags & CSSF_MASK_STATUS)
@@ -1086,10 +1086,8 @@ INT_PTR CIcqProto::GetXStatusIcon(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-INT_PTR CIcqProto::RequestXStatusDetails(WPARAM wParam, LPARAM lParam)
+INT_PTR CIcqProto::RequestXStatusDetails(WPARAM hContact, LPARAM lParam)
 {
-	MCONTACT hContact = wParam;
-
 	if (!m_bXStatusEnabled)
 		return 0;
 
diff --git a/protocols/IcqOscarJ/src/icqosc_svcs.cpp b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
index d70f103374..c261468d5c 100644
--- a/protocols/IcqOscarJ/src/icqosc_svcs.cpp
+++ b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
@@ -710,11 +710,10 @@ INT_PTR __cdecl CIcqProto::IcqAddCapability(WPARAM wParam, LPARAM lParam)
 }
 
 
-INT_PTR __cdecl CIcqProto::IcqCheckCapability(WPARAM wParam, LPARAM lParam)
+INT_PTR __cdecl CIcqProto::IcqCheckCapability(WPARAM hContact, LPARAM lParam)
 {
     int res = 0;
     DBVARIANT dbvariant;
-	 MCONTACT hContact = wParam;
     ICQ_CUSTOMCAP *icqCustomCap = (ICQ_CUSTOMCAP *)lParam;
 
 	 db_get(hContact, m_szModuleName, "CapBuf", &dbvariant);