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/AVS/src/cache.cpp | 4 ++-- plugins/AVS/src/main.cpp | 2 +- plugins/AVS/src/options.cpp | 18 +++++++++--------- plugins/AVS/src/utils.cpp | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'plugins/AVS') diff --git a/plugins/AVS/src/cache.cpp b/plugins/AVS/src/cache.cpp index 56a443afab..472c03e1a2 100644 --- a/plugins/AVS/src/cache.cpp +++ b/plugins/AVS/src/cache.cpp @@ -151,7 +151,7 @@ void NotifyMetaAware(MCONTACT hContact, CacheNode *node = NULL, AVATARCACHEENTRY if (ace == (AVATARCACHEENTRY *)-1) ace = &node->ace; - NotifyEventHooks(hEventChanged, (WPARAM)hContact, (LPARAM)ace); + NotifyEventHooks(hEventChanged, hContact, (LPARAM)ace); if (g_MetaAvail && (node->dwFlags & MC_ISSUBCONTACT) && db_get_b(NULL, g_szMetaName, "Enabled", 0)) { MCONTACT hMasterContact = (MCONTACT)db_get_dw(hContact, g_szMetaName, "Handle", 0); @@ -192,7 +192,7 @@ void NotifyMetaAware(MCONTACT hContact, CacheNode *node = NULL, AVATARCACHEENTRY NotifyEventHooks(hEventContactAvatarChanged, (WPARAM)cacn.hContact, (LPARAM)&cacn); } - else NotifyEventHooks(hEventContactAvatarChanged, (WPARAM)hContact, NULL); + else NotifyEventHooks(hEventContactAvatarChanged, hContact, NULL); } } diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index 9b00e6be82..aa6531e167 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -144,7 +144,7 @@ static int MetaChanged(WPARAM hContact, LPARAM lParam) } else ace = &node->ace; - NotifyEventHooks(hEventChanged, (WPARAM)hContact, (LPARAM)ace); + NotifyEventHooks(hEventChanged, hContact, (LPARAM)ace); return 0; } diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index 6d28942e5c..4622f0d1b2 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -507,7 +507,7 @@ INT_PTR CALLBACK DlgProcAvatarOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA hContact = lParam; TranslateDialogDefault(hwndDlg); if (hContact) { - szNick = (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR); + szNick = (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR); mir_sntprintf(szTitle, 500, TranslateT("Set avatar options for %s"), szNick); SetWindowText(hwndDlg, szTitle); } @@ -564,12 +564,12 @@ INT_PTR CALLBACK DlgProcAvatarOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA case IDC_PROTECTAVATAR: { BOOL locked = IsDlgButtonChecked(hwndDlg, IDC_PROTECTAVATAR); - ProtectAvatar((WPARAM)hContact, locked ? 1 : 0); + ProtectAvatar(hContact, locked ? 1 : 0); } break; case IDC_CHANGE: - SetAvatar((WPARAM)hContact, 0); + SetAvatar(hContact, 0); SendMessage(hwndDlg, DM_SETAVATARNAME, 0, 0); CheckDlgButton(hwndDlg, IDC_PROTECTAVATAR, db_get_b(hContact, "ContactPhoto", "Locked", 0) ? TRUE : FALSE); break; @@ -598,7 +598,7 @@ INT_PTR CALLBACK DlgProcAvatarOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA char *szProto = GetContactProto(hContact); DBVARIANT dbv = {0}; - ProtectAvatar((WPARAM)hContact, 0); + ProtectAvatar(hContact, 0); if (MessageBox(0, TranslateT("Delete picture file from disk (may be necessary to force a reload, but will delete local pictures)?"), TranslateT("Reset contact picture"), MB_YESNO) == IDYES) { if ( !db_get_ts(hContact, "ContactPhoto", "File", &dbv)) { DeleteFile(dbv.ptszVal); @@ -623,7 +623,7 @@ INT_PTR CALLBACK DlgProcAvatarOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA case IDC_DELETE: { DBVARIANT dbv = {0}; - ProtectAvatar((WPARAM)hContact, 0); + ProtectAvatar(hContact, 0); if (MessageBox(0, TranslateT("Delete picture file from disk (may be necessary to force a reload, but will delete local pictures)?"), TranslateT("Reset contact picture"), MB_YESNO) == IDYES) { if ( !db_get_ts(hContact, "ContactPhoto", "File", &dbv)) { DeleteFile(dbv.ptszVal); @@ -812,7 +812,7 @@ static INT_PTR CALLBACK DlgProcAvatarUserInfo(HWND hwndDlg, UINT msg, WPARAM wPa break; case IDC_CHANGE: - SetAvatar((WPARAM)hContact, 0); + SetAvatar(hContact, 0); SendMessage(hwndDlg, DM_SETAVATARNAME, 0, 0); CheckDlgButton(hwndDlg, IDC_PROTECTAVATAR, db_get_b(hContact, "ContactPhoto", "Locked", 0) ? TRUE : FALSE); break; @@ -830,7 +830,7 @@ static INT_PTR CALLBACK DlgProcAvatarUserInfo(HWND hwndDlg, UINT msg, WPARAM wPa { BOOL locked = IsDlgButtonChecked(hwndDlg, IDC_PROTECTAVATAR); SaveTransparentData(hwndDlg, hContact, locked); - ProtectAvatar((WPARAM)hContact, locked ? 1 : 0); + ProtectAvatar(hContact, locked ? 1 : 0); break; } @@ -856,7 +856,7 @@ static INT_PTR CALLBACK DlgProcAvatarUserInfo(HWND hwndDlg, UINT msg, WPARAM wPa char *szProto = GetContactProto(hContact); DBVARIANT dbv = {0}; - ProtectAvatar((WPARAM)hContact, 0); + ProtectAvatar(hContact, 0); if (MessageBox(0, TranslateT("Delete picture file from disk (may be necessary to force a reload, but will delete local pictures)?"), TranslateT("Reset contact picture"), MB_YESNO) == IDYES) { if ( !db_get_ts(hContact, "ContactPhoto", "File", &dbv)) { DeleteFile(dbv.ptszVal); @@ -879,7 +879,7 @@ static INT_PTR CALLBACK DlgProcAvatarUserInfo(HWND hwndDlg, UINT msg, WPARAM wPa { DBVARIANT dbv = {0}; - ProtectAvatar((WPARAM)hContact, 0); + ProtectAvatar(hContact, 0); if (MessageBox(0, TranslateT("Delete picture file from disk (may be necessary to force a reload, but will delete local pictures)?"), TranslateT("Reset contact picture"), MB_YESNO) == IDYES) { if ( !db_get_ts(hContact, "ContactPhoto", "File", &dbv)) { DeleteFile(dbv.ptszVal); diff --git a/plugins/AVS/src/utils.cpp b/plugins/AVS/src/utils.cpp index 35bebb621b..721d93282e 100644 --- a/plugins/AVS/src/utils.cpp +++ b/plugins/AVS/src/utils.cpp @@ -47,7 +47,7 @@ int _DebugTrace(MCONTACT hContact, const char *fmt, ...) char *proto = NULL; if (hContact != NULL) { - name = (char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, 0); + name = (char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, 0); proto = GetContactProto(hContact); } @@ -514,7 +514,7 @@ MCONTACT GetContactThatHaveTheAvatar(MCONTACT hContact, int locked) locked = db_get_b(hContact, "ContactPhoto", "Locked", 0); if (!locked) - hContact = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0); + hContact = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, hContact, 0); } } return hContact; -- cgit v1.2.3