From 371db973914f270432e914922b735e01279c5db8 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 12 Feb 2014 14:12:44 +0000
Subject: another bunch of useless conversions died

git-svn-id: http://svn.miranda-ng.org/main/trunk@8109 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/MRA/src/MraChat.cpp       |  4 ++--
 protocols/MRA/src/MraConstans.h     |  2 +-
 protocols/MRA/src/Mra_functions.cpp | 10 +++++-----
 protocols/MRA/src/Mra_menus.cpp     |  2 +-
 protocols/MRA/src/Mra_proto.cpp     |  8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'protocols/MRA/src')

diff --git a/protocols/MRA/src/MraChat.cpp b/protocols/MRA/src/MraChat.cpp
index 209d14c71c..69be898335 100644
--- a/protocols/MRA/src/MraChat.cpp
+++ b/protocols/MRA/src/MraChat.cpp
@@ -240,6 +240,6 @@ void CMraProto::MraChatSendPrivateMessage(LPSTR lpszEMail)
 	if (bAdded)
 		db_set_b(hContact, "CList", "Hidden", 1);
 
-	CallService(MS_IGNORE_UNIGNORE, (WPARAM)hContact, IGNOREEVENT_ALL);
-	CallService(MS_MSG_SENDMESSAGE, (WPARAM)hContact, 0);
+	CallService(MS_IGNORE_UNIGNORE, hContact, IGNOREEVENT_ALL);
+	CallService(MS_MSG_SENDMESSAGE, hContact, 0);
 }
diff --git a/protocols/MRA/src/MraConstans.h b/protocols/MRA/src/MraConstans.h
index c480cfcd75..bb9808bcd1 100644
--- a/protocols/MRA/src/MraConstans.h
+++ b/protocols/MRA/src/MraConstans.h
@@ -84,7 +84,7 @@ static const LPSTR lpcszMailRuDomains[] =
 #define MRA_FORGOT_PASSWORD_URL              _T("http://win.mail.ru/cgi-bin/passremind")
 
 
-// wParam = (WPARAM)hContact
+// wParam = hContact
 #define MRA_REQ_AUTH                         "/ReqAuth"
 #define MRA_REQ_AUTH_STR                     LPGEN("Request authorization")
 #define MRA_GRANT_AUTH                       "/GrantAuth"
diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp
index 7d52e201ac..22def539cd 100644
--- a/protocols/MRA/src/Mra_functions.cpp
+++ b/protocols/MRA/src/Mra_functions.cpp
@@ -361,7 +361,7 @@ DWORD CMraProto::GetContactFlags(MCONTACT hContact)
 			break;
 		}
 
-		if (CallService(MS_IGNORE_ISIGNORED, (WPARAM)hContact, IGNOREEVENT_MESSAGE)) dwRet |= CONTACT_FLAG_IGNORE;
+		if (CallService(MS_IGNORE_ISIGNORED, hContact, IGNOREEVENT_MESSAGE)) dwRet |= CONTACT_FLAG_IGNORE;
 	}
 	return(dwRet);
 }
@@ -391,9 +391,9 @@ DWORD CMraProto::SetContactFlags(MCONTACT hContact, DWORD dwContactFlag)
 	}
 
 	if (dwContactFlag & CONTACT_FLAG_IGNORE)
-		CallService(MS_IGNORE_IGNORE, (WPARAM)hContact, IGNOREEVENT_MESSAGE);
+		CallService(MS_IGNORE_IGNORE, hContact, IGNOREEVENT_MESSAGE);
 	else
-		CallService(MS_IGNORE_UNIGNORE, (WPARAM)hContact, IGNOREEVENT_MESSAGE);
+		CallService(MS_IGNORE_UNIGNORE, hContact, IGNOREEVENT_MESSAGE);
 
 	return 0;
 }
@@ -542,7 +542,7 @@ MCONTACT CMraProto::MraHContactFromEmail(const CMStringA &szEmail, BOOL bAddIfNe
 		}
 		else {
 			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);
 		}
 
 		if (hContact) {
@@ -711,7 +711,7 @@ bool IsHTTPSProxyUsed(HANDLE m_hNetlibUser)
 // определяет принадлежность контакта данной копии плагина
 bool CMraProto::IsContactMra(MCONTACT hContact)
 {
-	return CallService(MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, (LPARAM)m_szModuleName) != 0;
+	return CallService(MS_PROTO_ISPROTOONCONTACT, hContact, (LPARAM)m_szModuleName) != 0;
 }
 
 // определяется является ли контакт контактом MRA протокола, не зависимо от того какому плагину он принадлежит
diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp
index 2caf912b09..b7a045a62f 100644
--- a/protocols/MRA/src/Mra_menus.cpp
+++ b/protocols/MRA/src/Mra_menus.cpp
@@ -72,7 +72,7 @@ INT_PTR CMraProto::MraRequestAuthForAll(WPARAM wParam, LPARAM lParam)
 			DWORD dwContactSeverFlags;
 			if (GetContactBasicInfoW(hContact, NULL, NULL, NULL, &dwContactSeverFlags, NULL, NULL, NULL, NULL) == NO_ERROR)
 			if (dwContactSeverFlags & CONTACT_INTFLAG_NOT_AUTHORIZED && dwContactSeverFlags != -1)
-				MraRequestAuthorization((WPARAM)hContact, 0);
+				MraRequestAuthorization(hContact, 0);
 		}
 	}
 	return 0;
diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp
index eb968f9d10..1f30dff05c 100644
--- a/protocols/MRA/src/Mra_proto.cpp
+++ b/protocols/MRA/src/Mra_proto.cpp
@@ -1294,7 +1294,7 @@ bool CMraProto::CmdClist2(BinBuffer &buf)
 
 						if (dwContactSeverFlags & CONTACT_INTFLAG_NOT_AUTHORIZED)
 						if (getByte("AutoAuthRequestOnLogon", MRA_DEFAULT_AUTO_AUTH_REQ_ON_LOGON))
-							CallProtoService(m_szModuleName, MRA_REQ_AUTH, (WPARAM)hContact, 0);
+							CallProtoService(m_szModuleName, MRA_REQ_AUTH, hContact, 0);
 					}
 				}
 			}
@@ -1680,9 +1680,9 @@ DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, CMStringA &
 
 		// user typing
 		if (dwFlags & MESSAGE_FLAG_NOTIFY)
-			CallService(MS_PROTO_CONTACTISTYPING, (WPARAM)hContact, MAILRU_CONTACTISTYPING_TIMEOUT);
+			CallService(MS_PROTO_CONTACTISTYPING, hContact, MAILRU_CONTACTISTYPING_TIMEOUT);
 		else { // text/contact/auth // typing OFF
-			CallService(MS_PROTO_CONTACTISTYPING, (WPARAM)hContact, PROTOTYPE_CONTACTTYPING_OFF);
+			CallService(MS_PROTO_CONTACTISTYPING, hContact, PROTOTYPE_CONTACTTYPING_OFF);
 
 			if (dwFlags & MESSAGE_FLAG_MULTICHAT) {
 				DWORD dwMultiChatEventType;
@@ -1787,7 +1787,7 @@ DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, CMStringA &
 				}
 				else if (dwFlags & MESSAGE_FLAG_ALARM) { // alarm
 					if (m_heNudgeReceived)
-						NotifyEventHooks(m_heNudgeReceived, (WPARAM)hContact, NULL);
+						NotifyEventHooks(m_heNudgeReceived, hContact, NULL);
 					else {
 						pre.flags = PREF_UNICODE;
 						pre.szMessage = (LPSTR)TranslateTS(MRA_ALARM_MESSAGE);
-- 
cgit v1.2.3