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/UserInfoEx/src/classMTime.cpp | 2 +- plugins/UserInfoEx/src/dlg_propsheet.cpp | 2 +- plugins/UserInfoEx/src/mir_db.cpp | 6 +++--- plugins/UserInfoEx/src/psp_profile.cpp | 8 ++++---- plugins/UserInfoEx/src/svc_avatar.cpp | 2 +- plugins/UserInfoEx/src/svc_email.cpp | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'plugins/UserInfoEx/src') diff --git a/plugins/UserInfoEx/src/classMTime.cpp b/plugins/UserInfoEx/src/classMTime.cpp index 65939b07ad..10c9d77a23 100644 --- a/plugins/UserInfoEx/src/classMTime.cpp +++ b/plugins/UserInfoEx/src/classMTime.cpp @@ -414,7 +414,7 @@ void MTime::GetLocalTime(MCONTACT hContact) GetTimeUTC(); - if (!GetContactTimeZoneInformation((WPARAM)hContact, (LPARAM)&tzi)) { + if (!GetContactTimeZoneInformation(hContact, (LPARAM)&tzi)) { UTCToTzSpecificLocal(&tzi); } } diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index 9cf0dd26bc..44009f8722 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -1362,7 +1362,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar if (hContact != pPs->hContact) { if (!myGlobals.szMetaProto) break; - if (pPs->hContact != (MCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, NULL)) + if (pPs->hContact != (MCONTACT)CallService(MS_MC_GETMETACONTACT, hContact, NULL)) break; if (!db_get_b(NULL, MODNAME, SET_META_SCAN, TRUE)) break; diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp index a87b654658..f24496beeb 100644 --- a/plugins/UserInfoEx/src/mir_db.cpp +++ b/plugins/UserInfoEx/src/mir_db.cpp @@ -58,7 +58,7 @@ MCONTACT GetMeta(MCONTACT hContact) if (!myGlobals.szMetaProto) return NULL; - MCONTACT result = (MCONTACT)CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0); + MCONTACT result = (MCONTACT)CallService(MS_MC_GETMETACONTACT, hContact, 0); return (result == (MCONTACT)CALLSERVICE_NOTFOUND) ? NULL : result; } @@ -192,7 +192,7 @@ bool IsEmpty(MCONTACT hContact, LPCSTR pszModule) DBCONTACTENUMSETTINGS dbces = { 0 }; dbces.pfnEnumProc = IsEmptyEnumProc; dbces.szModule = pszModule; - return (0 > CallService(MS_DB_CONTACT_ENUMSETTINGS, (WPARAM)hContact, (LPARAM)&dbces)); + return (0 > CallService(MS_DB_CONTACT_ENUMSETTINGS, hContact, (LPARAM)&dbces)); } /** @@ -832,7 +832,7 @@ INT_PTR CEnumList::EnumSettings(MCONTACT hContact, LPCSTR pszModule) dbces.pfnEnumProc = (DBSETTINGENUMPROC)CEnumList::EnumSettingsProc; dbces.szModule = pszModule; dbces.lParam = (LPARAM)this; - return CallService(MS_DB_CONTACT_ENUMSETTINGS, (WPARAM)hContact, (LPARAM)&dbces); + return CallService(MS_DB_CONTACT_ENUMSETTINGS, hContact, (LPARAM)&dbces); } } /* namespace DB */ \ No newline at end of file diff --git a/plugins/UserInfoEx/src/psp_profile.cpp b/plugins/UserInfoEx/src/psp_profile.cpp index 621e913492..c63bc0e4ab 100644 --- a/plugins/UserInfoEx/src/psp_profile.cpp +++ b/plugins/UserInfoEx/src/psp_profile.cpp @@ -1143,22 +1143,22 @@ INT_PTR CALLBACK PSPProcContactProfile(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR // scan all basic protocols for the subcontacts if (DB::Module::IsMetaAndScan(pszProto)) { - int iDefault = CallService(MS_MC_GETDEFAULTCONTACTNUM, (WPARAM)hContact, NULL); + int iDefault = CallService(MS_MC_GETDEFAULTCONTACTNUM, hContact, NULL); MCONTACT hSubContact, hDefContact; LPCSTR pszSubBaseProto; int j, numSubs; - if ((hDefContact = (MCONTACT)CallService(MS_MC_GETSUBCONTACT, (WPARAM)hContact, iDefault)) && + if ((hDefContact = (MCONTACT)CallService(MS_MC_GETSUBCONTACT, hContact, iDefault)) && (pszSubBaseProto = DB::Contact::Proto(hDefContact))) { if ((numProtoItems += ProfileList_AddItemlistFromDB(pList, iItem, idList, nList, hDefContact, pszSubBaseProto, pFmt[i].szCatFmt, pFmt[i].szValFmt, CTRLF_HASMETA|CTRLF_HASPROTO)) < 0) return FALSE; // copy the missing settings from the other subcontacts - numSubs = CallService(MS_MC_GETNUMCONTACTS, (WPARAM)hContact, NULL); + numSubs = CallService(MS_MC_GETNUMCONTACTS, hContact, NULL); for (j = 0; j < numSubs; j++) { if (j == iDefault) continue; - if (!(hSubContact = (MCONTACT)CallService(MS_MC_GETSUBCONTACT, (WPARAM)hContact, j))) continue; + if (!(hSubContact = (MCONTACT)CallService(MS_MC_GETSUBCONTACT, hContact, j))) continue; if (!(pszSubBaseProto = DB::Contact::Proto(hSubContact))) continue; if ((numProtoItems += ProfileList_AddItemlistFromDB(pList, iItem, idList, nList, hSubContact, pszSubBaseProto, pFmt[i].szCatFmt, pFmt[i].szValFmt, CTRLF_HASMETA|CTRLF_HASPROTO)) < 0) return FALSE; diff --git a/plugins/UserInfoEx/src/svc_avatar.cpp b/plugins/UserInfoEx/src/svc_avatar.cpp index c6edeaab85..3530f28ec1 100644 --- a/plugins/UserInfoEx/src/svc_avatar.cpp +++ b/plugins/UserInfoEx/src/svc_avatar.cpp @@ -70,7 +70,7 @@ namespace NServices //GetIconInfo(zodiac.hIcon, &iinfo); // save the bitmap to a file used as avatar later - if (!CallService(MS_AV_SETAVATAR, (WPARAM)hContact, (LPARAM)szFileName)) + if (!CallService(MS_AV_SETAVATAR, hContact, (LPARAM)szFileName)) db_set_b(hContact, "ContactPhoto", "IsZodiac", 1); } } diff --git a/plugins/UserInfoEx/src/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp index eb366250f3..1b6430df86 100644 --- a/plugins/UserInfoEx/src/svc_email.cpp +++ b/plugins/UserInfoEx/src/svc_email.cpp @@ -147,7 +147,7 @@ static int OnContactSettingChanged(MCONTACT hContact, DBCONTACTWRITESETTING* pdb !mir_strncmp(pdbcws->szSetting, SET_CONTACT_COMPANY_EMAIL, 13) || !mir_strncmp(pdbcws->szSetting, "mye-mail0", 9))) { - OnCListApplyIcons((WPARAM)hContact, 0); + OnCListApplyIcons(hContact, 0); } return 0; } -- cgit v1.2.3