From 1925d3521846f4e6683d3d537cc41de9c9bd7250 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 11 Feb 2014 19:01:03 +0000
Subject: "we don't need these variables" (c) Pink Floyd

git-svn-id: http://svn.miranda-ng.org/main/trunk@8101 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/MRA/src/Mra_menus.cpp |  6 ++----
 protocols/MRA/src/Mra_svcs.cpp  | 22 +++++++---------------
 2 files changed, 9 insertions(+), 19 deletions(-)

(limited to 'protocols/MRA')

diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp
index acb3853288..2caf912b09 100644
--- a/protocols/MRA/src/Mra_menus.cpp
+++ b/protocols/MRA/src/Mra_menus.cpp
@@ -78,9 +78,8 @@ INT_PTR CMraProto::MraRequestAuthForAll(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-INT_PTR CMraProto::MraRequestAuthorization(WPARAM wParam, LPARAM lParam)
+INT_PTR CMraProto::MraRequestAuthorization(WPARAM hContact, LPARAM lParam)
 {
-	MCONTACT hContact = wParam;
 	if (!hContact)
 		return 0;
 
@@ -236,12 +235,11 @@ INT_PTR CMraProto::MraWorld(WPARAM wParam, LPARAM lParam)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-int CMraProto::MraRebuildContactMenu(WPARAM wParam, LPARAM lParam)
+int CMraProto::MraRebuildContactMenu(WPARAM hContact, LPARAM lParam)
 {
 	BOOL bIsContactMRA, bHasEMail, bHasEMailMR, bChatAgent;
 	DWORD dwContactSeverFlags = 0;
 	CMStringW blogStatusMsgSize;
-	MCONTACT hContact = wParam;
 
 	// proto own contact
 	bIsContactMRA = IsContactMra(hContact);
diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp
index b61e137105..1ffb37e18e 100644
--- a/protocols/MRA/src/Mra_svcs.cpp
+++ b/protocols/MRA/src/Mra_svcs.cpp
@@ -166,9 +166,8 @@ INT_PTR CMraProto::MraXStatusMenu(WPARAM wParam, LPARAM lParam, LPARAM param)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-int CMraProto::MraContactDeleted(WPARAM wParam, LPARAM lParam)
+int CMraProto::MraContactDeleted(WPARAM hContact, LPARAM lParam)
 {
-	MCONTACT hContact = wParam;
 	if (!m_bLoggedIn || !hContact)
 		return 0;
 
@@ -186,13 +185,9 @@ int CMraProto::MraContactDeleted(WPARAM wParam, LPARAM lParam)
 	return 0;
 }
 
-int CMraProto::MraDbSettingChanged(WPARAM wParam, LPARAM lParam)
+int CMraProto::MraDbSettingChanged(WPARAM hContact, LPARAM lParam)
 {
-	if (!m_bLoggedIn || !lParam)
-		return 0;
-
-	MCONTACT hContact = wParam;
-	if (hContact == NULL)
+	if (!m_bLoggedIn || !lParam || !hContact)
 		return 0;
 
 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;
@@ -447,9 +442,8 @@ INT_PTR CMraProto::MraSetXStatusEx(WPARAM wParam, LPARAM lParam)
 	return iRet;
 }
 
-INT_PTR CMraProto::MraGetXStatusEx(WPARAM wParam, LPARAM lParam)
+INT_PTR CMraProto::MraGetXStatusEx(WPARAM hContact, LPARAM lParam)
 {
-	MCONTACT hContact = wParam;
 	CUSTOM_STATUS *pData = (CUSTOM_STATUS*)lParam;
 
 	if (pData->cbSize < sizeof(CUSTOM_STATUS))
@@ -548,11 +542,10 @@ DWORD CMraProto::MraSendNewStatus(DWORD dwStatusMir, DWORD dwXStatusMir, const C
 	return 0;
 }
 
-INT_PTR CMraProto::MraSendNudge(WPARAM wParam, LPARAM lParam)
+INT_PTR CMraProto::MraSendNudge(WPARAM hContact, LPARAM lParam)
 {
-	if (m_bLoggedIn && wParam) {
+	if (m_bLoggedIn && hContact) {
 		LPWSTR lpwszAlarmMessage = TranslateW(MRA_ALARM_MESSAGE);
-		MCONTACT hContact = wParam;
 
 		CMStringA szEmail;
 		if (mraGetStringA(hContact, "e-mail", szEmail))
@@ -617,9 +610,8 @@ INT_PTR CMraProto::MraGetMyAvatar(WPARAM wParam, LPARAM lParam)
 ////////////////////////////////////////////////////////////////////////////////////////////////
 // processes clist group removal
 
-int CMraProto::OnGroupChanged(WPARAM wParam, LPARAM lParam)
+int CMraProto::OnGroupChanged(WPARAM hContact, LPARAM lParam)
 {
-	MCONTACT hContact = wParam;
 	if (hContact == NULL) {
 		CLISTGROUPCHANGE *cgc = (CLISTGROUPCHANGE*)lParam;
 		if (cgc->pszOldName == NULL)
-- 
cgit v1.2.3