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 --- plugins/SecureIM/src/svcs_clist.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'plugins/SecureIM/src/svcs_clist.cpp') diff --git a/plugins/SecureIM/src/svcs_clist.cpp b/plugins/SecureIM/src/svcs_clist.cpp index b2af53bb19..24efb7785b 100644 --- a/plugins/SecureIM/src/svcs_clist.cpp +++ b/plugins/SecureIM/src/svcs_clist.cpp @@ -3,7 +3,7 @@ int __cdecl onContactSettingChanged(WPARAM wParam,LPARAM lParam) { - HANDLE hContact = (HANDLE)wParam; + HCONTACT hContact = (HCONTACT)wParam; DBCONTACTWRITESETTING *cws=(DBCONTACTWRITESETTING*)lParam; if (!hContact || strcmp(cws->szSetting,"Status")) return 0; @@ -35,8 +35,9 @@ int __cdecl onContactSettingChanged(WPARAM wParam,LPARAM lParam) { // wParam=(WPARAM)(HANDLE)hContact // lParam=0 -int __cdecl onContactAdded(WPARAM wParam,LPARAM lParam) { - addContact((HANDLE)wParam); +int __cdecl onContactAdded(WPARAM wParam,LPARAM lParam) +{ + addContact((HCONTACT)wParam); return 0; } @@ -45,7 +46,7 @@ int __cdecl onContactAdded(WPARAM wParam,LPARAM lParam) { // lParam=0 int __cdecl onContactDeleted(WPARAM wParam,LPARAM lParam) { - delContact((HANDLE)wParam); + delContact((HCONTACT)wParam); return 0; } @@ -58,15 +59,15 @@ int __cdecl onExtraImageListRebuilding(WPARAM, LPARAM) int __cdecl onExtraImageApplying(WPARAM wParam, LPARAM) { - if (isSecureProtocol((HANDLE)wParam)) - ExtraIcon_SetIcon(g_hCLIcon, (HANDLE)wParam, mode2clicon( isContactSecured((HANDLE)wParam), 1)); + if (isSecureProtocol((HCONTACT)wParam)) + ExtraIcon_SetIcon(g_hCLIcon, (HCONTACT)wParam, mode2clicon(isContactSecured((HCONTACT)wParam), 1)); return 0; } int __cdecl onRebuildContactMenu(WPARAM wParam,LPARAM lParam) { - HANDLE hContact = (HANDLE)wParam; + HCONTACT hContact = (HCONTACT)wParam; BOOL bMC = isProtoMetaContacts(hContact); if (bMC ) hContact = getMostOnline(hContact); // возьмем тот, через который пойдет сообщение pUinKey ptr = getUinKey(hContact); -- cgit v1.2.3