From ddba4ede6b451d0cfcd0d32b5180fbd0689966bf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 08:04:30 +0000 Subject: - HANDLE hContact => HCONTACT - GCF_* prefix was added to chat constants to avoid name conflicts git-svn-id: http://svn.miranda-ng.org/main/trunk@8078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MSN/src/msn_menu.cpp | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'protocols/MSN/src/msn_menu.cpp') diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp index 76e2e9f784..e9e6cf3b1a 100644 --- a/protocols/MSN/src/msn_menu.cpp +++ b/protocols/MSN/src/msn_menu.cpp @@ -32,9 +32,8 @@ HANDLE hNetMeeting, hBlockCom, hSendHotMail, hInviteChat, hViewProfile; INT_PTR CMsnProto::MsnBlockCommand(WPARAM wParam, LPARAM) { - if (msnLoggedIn) - { - const HANDLE hContact = (HANDLE)wParam; + if (msnLoggedIn) { + HCONTACT hContact = (HCONTACT)wParam; char tEmail[MSN_MAX_EMAIL_LEN]; db_get_static(hContact, m_szModuleName, "e-mail", tEmail, sizeof(tEmail)); @@ -52,7 +51,7 @@ INT_PTR CMsnProto::MsnBlockCommand(WPARAM wParam, LPARAM) INT_PTR CMsnProto::MsnGotoInbox(WPARAM, LPARAM) { - HANDLE hContact = MSN_HContactFromEmail(MyOptions.szEmail); + HCONTACT hContact = MSN_HContactFromEmail(MyOptions.szEmail); if (hContact) CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM) 1); MsnInvokeMyURL(true, "http://mail.live.com?rru=inbox"); @@ -61,7 +60,7 @@ INT_PTR CMsnProto::MsnGotoInbox(WPARAM, LPARAM) INT_PTR CMsnProto::MsnSendHotmail(WPARAM wParam, LPARAM) { - const HANDLE hContact = (HANDLE)wParam; + HCONTACT hContact = (HCONTACT)wParam; char szEmail[MSN_MAX_EMAIL_LEN]; if (MSN_IsMeByContact(hContact, szEmail)) @@ -86,7 +85,7 @@ INT_PTR CMsnProto::MsnSetupAlerts(WPARAM, LPARAM) INT_PTR CMsnProto::MsnViewProfile(WPARAM wParam, LPARAM) { - const HANDLE hContact = (HANDLE)wParam; + HCONTACT hContact = (HCONTACT)wParam; char buf[64], *cid; if (hContact == NULL) @@ -128,7 +127,7 @@ INT_PTR CMsnProto::MsnInviteCommand(WPARAM, LPARAM) int CMsnProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM) { - const HANDLE hContact = (HANDLE)wParam; + HCONTACT hContact = (HCONTACT)wParam; char szEmail[MSN_MAX_EMAIL_LEN]; if ( !MSN_IsMyContact(hContact)) @@ -158,10 +157,9 @@ int CMsnProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM) int CMsnProto::OnContactDoubleClicked(WPARAM wParam, LPARAM) { - const HANDLE hContact = (HANDLE)wParam; + HCONTACT hContact = (HCONTACT)wParam; - if (emailEnabled && MSN_IsMeByContact(hContact)) - { + if (emailEnabled && MSN_IsMeByContact(hContact)) { MsnSendHotmail(wParam, 0); return 1; } @@ -175,7 +173,7 @@ INT_PTR CMsnProto::MsnSendNetMeeting(WPARAM wParam, LPARAM) { if (!msnLoggedIn) return 0; - HANDLE hContact = HANDLE(wParam); + HCONTACT hContact = HCONTACT(wParam); char szEmail[MSN_MAX_EMAIL_LEN]; if (MSN_IsMeByContact(hContact, szEmail)) return 0; @@ -361,7 +359,7 @@ void CMsnProto::MSN_EnableMenuItems(bool bEnable) ////////////////////////////////////////////////////////////////////////////////////// -static CMsnProto* GetProtoInstanceByHContact(HANDLE hContact) +static CMsnProto* GetProtoInstanceByHContact(HCONTACT hContact) { char* szProto = GetContactProto(hContact); if (szProto == NULL) @@ -376,31 +374,31 @@ static CMsnProto* GetProtoInstanceByHContact(HANDLE hContact) static INT_PTR MsnMenuBlockCommand(WPARAM wParam, LPARAM lParam) { - CMsnProto* ppro = GetProtoInstanceByHContact((HANDLE)wParam); + CMsnProto* ppro = GetProtoInstanceByHContact((HCONTACT)wParam); return (ppro) ? ppro->MsnBlockCommand(wParam, lParam) : 0; } static INT_PTR MsnMenuViewProfile(WPARAM wParam, LPARAM lParam) { - CMsnProto* ppro = GetProtoInstanceByHContact((HANDLE)wParam); + CMsnProto* ppro = GetProtoInstanceByHContact((HCONTACT)wParam); return (ppro) ? ppro->MsnViewProfile(wParam, lParam) : 0; } static INT_PTR MsnMenuSendNetMeeting(WPARAM wParam, LPARAM lParam) { - CMsnProto* ppro = GetProtoInstanceByHContact((HANDLE)wParam); + CMsnProto* ppro = GetProtoInstanceByHContact((HCONTACT)wParam); return (ppro) ? ppro->MsnSendNetMeeting(wParam, lParam) : 0; } static INT_PTR MsnMenuSendHotmail(WPARAM wParam, LPARAM lParam) { - CMsnProto* ppro = GetProtoInstanceByHContact((HANDLE)wParam); + CMsnProto* ppro = GetProtoInstanceByHContact((HCONTACT)wParam); return (ppro) ? ppro->MsnSendHotmail(wParam, lParam) : 0; } static int MSN_OnPrebuildContactMenu(WPARAM wParam, LPARAM lParam) { - CMsnProto* ppro = GetProtoInstanceByHContact((HANDLE)wParam); + CMsnProto* ppro = GetProtoInstanceByHContact((HCONTACT)wParam); if (ppro) ppro->OnPrebuildContactMenu(wParam, lParam); else { -- cgit v1.2.3