From 371db973914f270432e914922b735e01279c5db8 Mon Sep 17 00:00:00 2001 From: George Hazan 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 --- plugins/SecureIM/src/crypt_icons.cpp | 2 +- plugins/SecureIM/src/crypt_lists.cpp | 6 +++--- plugins/SecureIM/src/crypt_metacontacts.cpp | 6 +++--- plugins/SecureIM/src/crypt_popups.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/SecureIM/src') diff --git a/plugins/SecureIM/src/crypt_icons.cpp b/plugins/SecureIM/src/crypt_icons.cpp index f4eb6b75c2..1aa8a4f578 100644 --- a/plugins/SecureIM/src/crypt_icons.cpp +++ b/plugins/SecureIM/src/crypt_icons.cpp @@ -100,7 +100,7 @@ void ShowStatusIcon(MCONTACT hContact) void ShowStatusIconNotify(MCONTACT hContact) { BYTE mode = isContactSecured(hContact); - NotifyEventHooks(g_hEvent[(mode&SECURED) != 0], (WPARAM)hContact, 0); + NotifyEventHooks(g_hEvent[(mode&SECURED) != 0], hContact, 0); ShowStatusIcon(hContact,mode); } diff --git a/plugins/SecureIM/src/crypt_lists.cpp b/plugins/SecureIM/src/crypt_lists.cpp index c8727ed04a..ab44379d45 100644 --- a/plugins/SecureIM/src/crypt_lists.cpp +++ b/plugins/SecureIM/src/crypt_lists.cpp @@ -65,7 +65,7 @@ void freeSupportedProtocols() pSupPro getSupPro(MCONTACT hContact) { for (int j=0; j < arProto.getCount(); j++) - if (CallService(MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, (LPARAM)arProto[j]->name)) + if (CallService(MS_PROTO_ISPROTOONCONTACT, hContact, (LPARAM)arProto[j]->name)) return arProto[j]; return NULL; @@ -199,12 +199,12 @@ void addMsg2Queue(pUinKey ptr,WPARAM wParam,LPSTR szMsg) } void getContactNameA(MCONTACT hContact, LPSTR szName) { - strcpy(szName,(LPCSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,(WPARAM)hContact,0)); + strcpy(szName,(LPCSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,hContact,0)); } void getContactName(MCONTACT hContact, LPSTR szName) { - wcscpy((LPWSTR)szName, (LPWSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GSMDF_UNICODE)); + wcscpy((LPWSTR)szName, (LPWSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GSMDF_UNICODE)); } void getContactUinA(MCONTACT hContact, LPSTR szUIN) diff --git a/plugins/SecureIM/src/crypt_metacontacts.cpp b/plugins/SecureIM/src/crypt_metacontacts.cpp index 16304cffac..e99328f1d6 100644 --- a/plugins/SecureIM/src/crypt_metacontacts.cpp +++ b/plugins/SecureIM/src/crypt_metacontacts.cpp @@ -13,7 +13,7 @@ BOOL isProtoMetaContacts(MCONTACT hContact) BOOL isDefaultSubContact(MCONTACT hContact) { if (bMetaContacts) - return (MCONTACT)CallService(MS_MC_GETDEFAULTCONTACT,(WPARAM)CallService(MS_MC_GETMETACONTACT,(WPARAM)hContact,0),0) == hContact; + return (MCONTACT)CallService(MS_MC_GETDEFAULTCONTACT,(WPARAM)CallService(MS_MC_GETMETACONTACT,hContact,0),0) == hContact; return false; } @@ -21,7 +21,7 @@ BOOL isDefaultSubContact(MCONTACT hContact) MCONTACT getMetaContact(MCONTACT hContact) { if (bMetaContacts) - return (MCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0); + return (MCONTACT)CallService(MS_MC_GETMETACONTACT, hContact, 0); return 0; } @@ -29,7 +29,7 @@ MCONTACT getMetaContact(MCONTACT hContact) MCONTACT getMostOnline(MCONTACT hContact) { if (bMetaContacts) - return (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0); + return (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, hContact, 0); return 0; } diff --git a/plugins/SecureIM/src/crypt_popups.cpp b/plugins/SecureIM/src/crypt_popups.cpp index 39bca4ac55..1d368b22ca 100644 --- a/plugins/SecureIM/src/crypt_popups.cpp +++ b/plugins/SecureIM/src/crypt_popups.cpp @@ -41,7 +41,7 @@ void showPopup(LPCSTR lpzText,MCONTACT hContact,HICON hIcon, UINT type) POPUPDATAW ppd = {0}; ppd.lchContact = hContact; //Be sure to use a GOOD handle, since this will not be checked. ppd.lchIcon = hIcon; - LPWSTR lpwzContactName = (LPWSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,(WPARAM)hContact,GSMDF_UNICODE); + LPWSTR lpwzContactName = (LPWSTR)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,hContact,GSMDF_UNICODE); wcscpy(ppd.lpwzContactName, lpwzContactName); LPWSTR lpwzText = mir_a2u(lpzText); wcscpy(ppd.lpwzText, TranslateW(lpwzText)); -- cgit v1.2.3