From ee68ac82d5aabb596e8bd0f2b9286827ca2ce545 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 10 Feb 2014 21:37:41 +0000 Subject: these conversions aren't needed either git-svn-id: http://svn.miranda-ng.org/main/trunk@8088 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/UserInfoEx/src/Flags/svc_flags.cpp | 14 +++++++------- plugins/UserInfoEx/src/dlg_propsheet.cpp | 16 ++++++++-------- plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp | 4 ++-- plugins/UserInfoEx/src/psp_contact.cpp | 4 ++-- plugins/UserInfoEx/src/svc_contactinfo.cpp | 2 +- plugins/UserInfoEx/src/svc_email.cpp | 8 ++++---- plugins/UserInfoEx/src/svc_homepage.cpp | 4 ++-- plugins/UserInfoEx/src/svc_refreshci.cpp | 6 +++--- plugins/UserInfoEx/src/svc_reminder.cpp | 2 +- plugins/UserInfoEx/src/svc_timezone.cpp | 4 ++-- plugins/UserInfoEx/src/svc_timezone_old.cpp | 4 ++-- 11 files changed, 34 insertions(+), 34 deletions(-) (limited to 'plugins/UserInfoEx') diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp index c27e8a576d..1dbe3cbad7 100644 --- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp +++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp @@ -44,18 +44,18 @@ static LIST gMsgWndList(10, HandleKeySortT); static INT_PTR ServiceDetectContactOriginCountry(WPARAM wParam,LPARAM lParam) { WORD countryNumber; - char *pszProto = GetContactProto((MCONTACT)wParam); + char *pszProto = GetContactProto(wParam); /* UserinfoEx */ - if (countryNumber = db_get_w((MCONTACT)wParam, USERINFO, SET_CONTACT_ORIGIN_COUNTRY, 0)) + if (countryNumber = db_get_w(wParam, USERINFO, SET_CONTACT_ORIGIN_COUNTRY, 0)) return countryNumber; - if (countryNumber = db_get_w((MCONTACT)wParam, USERINFO, SET_CONTACT_COUNTRY, 0)) + if (countryNumber = db_get_w(wParam, USERINFO, SET_CONTACT_COUNTRY, 0)) return countryNumber; - if (countryNumber = db_get_w((MCONTACT)wParam, USERINFO, SET_CONTACT_COMPANY_COUNTRY, 0)) + if (countryNumber = db_get_w(wParam, USERINFO, SET_CONTACT_COMPANY_COUNTRY, 0)) return countryNumber; /* fallback proto settings */ - if (countryNumber = db_get_w((MCONTACT)wParam, pszProto, "Country", 0)) + if (countryNumber = db_get_w(wParam, pszProto, "Country", 0)) return countryNumber; - if (countryNumber = db_get_w((MCONTACT)wParam, pszProto, "CompanyCountry", 0)) + if (countryNumber = db_get_w(wParam, pszProto, "CompanyCountry", 0)) return countryNumber; return (INT_PTR)0xFFFF; @@ -69,7 +69,7 @@ static void CALLBACK SetExtraImage(LPARAM lParam) { /* get contact's country */ int countryNumber = ServiceDetectContactOriginCountry(lParam, 0); - ExtraIcon_SetIcon(hExtraIconSvc, (MCONTACT)lParam, (countryNumber != 0xFFFF || g_bUseUnknownFlag) ? LoadFlagHandle(countryNumber) : NULL); + ExtraIcon_SetIcon(hExtraIconSvc, lParam, (countryNumber != 0xFFFF || g_bUseUnknownFlag) ? LoadFlagHandle(countryNumber) : NULL); } static int OnCListApplyIcons(WPARAM wParam, LPARAM) diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index a8ec59ab5c..9cf0dd26bc 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -253,7 +253,7 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam) myGlobals.WantAeroAdaption = db_get_b(NULL, MODNAME, SET_PROPSHEET_AEROADAPTION, TRUE); // allow only one dialog per user - if (HWND hWnd = WindowList_Find(ghWindowList, (MCONTACT)wParam)) { + if (HWND hWnd = WindowList_Find(ghWindowList, wParam)) { SetForegroundWindow(hWnd); SetFocus(hWnd); return 0; @@ -285,7 +285,7 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam) ImageList_AddIcon(psh._hImages, hDefIcon); // init contact - psh._hContact = (MCONTACT)wParam; + psh._hContact = wParam; if (psh._hContact == NULL) { // mark owner icons as initiated bInitIcons |= INIT_ICONS_OWNER; @@ -294,7 +294,7 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam) } else { // get contact's protocol - psh._pszPrefix = psh._pszProto = DB::Contact::Proto((MCONTACT)wParam); + psh._pszPrefix = psh._pszProto = DB::Contact::Proto(wParam); if (psh._pszProto == NULL) { MsgErr(NULL, LPGENT("Could not find contact's protocol. Maybe it is not active!")); return 1; @@ -313,12 +313,12 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam) // metacontacts sub pages if (bScanMetaSubContacts) { - int numSubs = DB::MetaContact::SubCount((MCONTACT)wParam); + int numSubs = DB::MetaContact::SubCount(wParam); psh._dwFlags &= ~PSF_PROTOPAGESONLY_INIT; psh._dwFlags |= PSF_PROTOPAGESONLY; for (int i = 0; i < numSubs; i++) { - psh._hContact = DB::MetaContact::Sub((MCONTACT)wParam, i); + psh._hContact = DB::MetaContact::Sub(wParam, i); psh._nSubContact = i; if (psh._hContact) { psh._pszProto = DB::Contact::Proto(psh._hContact); @@ -326,7 +326,7 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM lParam) NotifyEventHooks(ghDetailsInitEvent, (WPARAM)&psh, (LPARAM)psh._hContact); } } - psh._hContact = (MCONTACT)wParam; + psh._hContact = wParam; } // sort the pages by the position read from database @@ -409,7 +409,7 @@ static INT_PTR AddPage(WPARAM wParam, LPARAM lParam) **/ static int OnDeleteContact(WPARAM wParam, LPARAM lParam) { - HWND hWnd = WindowList_Find(ghWindowList, (MCONTACT)wParam); + HWND hWnd = WindowList_Find(ghWindowList, wParam); if (hWnd != NULL) DestroyWindow(hWnd); return 0; @@ -1356,7 +1356,7 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar **/ case HM_SETTING_CHANGED: if (!(pPs->dwFlags & PSF_LOCKED)) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; DBCONTACTWRITESETTING *pdbcws = (DBCONTACTWRITESETTING*)lParam; if (hContact != pPs->hContact) { diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp index 50f0aba261..40e20e4606 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp @@ -233,7 +233,7 @@ INT_PTR svcExIm_ContactExport_Service(WPARAM wParam, LPARAM lParam) { ExImParam ExIm; ZeroMemory(&ExIm, sizeof(ExIm)); - ExIm.hContact = (MCONTACT)wParam; + ExIm.hContact = wParam; ExIm.Typ = EXIM_CONTACT; return SvcExImport_Export(&ExIm, (HWND)lParam); } @@ -242,7 +242,7 @@ INT_PTR svcExIm_ContactImport_Service(WPARAM wParam, LPARAM lParam) { ExImParam ExIm; ZeroMemory(&ExIm, sizeof(ExIm)); - ExIm.hContact = (MCONTACT)wParam; + ExIm.hContact = wParam; ExIm.Typ = EXIM_CONTACT; return SvcExImport_Import(&ExIm, (HWND)lParam); } diff --git a/plugins/UserInfoEx/src/psp_contact.cpp b/plugins/UserInfoEx/src/psp_contact.cpp index 0bce7739ae..c01c6c6257 100644 --- a/plugins/UserInfoEx/src/psp_contact.cpp +++ b/plugins/UserInfoEx/src/psp_contact.cpp @@ -41,7 +41,7 @@ INT_PTR CALLBACK PSPProcContactHome(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM if (pCtrlList) { TCHAR szAddr[MAX_PATH]; - MCONTACT hContact = (MCONTACT)lParam; + MCONTACT hContact = lParam; LPIDSTRLIST pList; UINT nList; @@ -196,7 +196,7 @@ INT_PTR CALLBACK PSPProcContactWork(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM if (pCtrlList) { TCHAR szAddr[MAX_PATH]; - MCONTACT hContact = (MCONTACT)lParam; + MCONTACT hContact = lParam; LPIDSTRLIST pList; UINT nList; diff --git a/plugins/UserInfoEx/src/svc_contactinfo.cpp b/plugins/UserInfoEx/src/svc_contactinfo.cpp index aaa4c816e2..7e98c90852 100644 --- a/plugins/UserInfoEx/src/svc_contactinfo.cpp +++ b/plugins/UserInfoEx/src/svc_contactinfo.cpp @@ -705,7 +705,7 @@ INT_PTR GetContactInfo(WPARAM wParam, LPARAM lParam) static INT_PTR GetContactSettingStrExService(WPARAM wParam, LPARAM lParam) { DBCONTACTGETSETTING *cgs = (DBCONTACTGETSETTING*)lParam; - return DB::Setting::GetEx((MCONTACT)wParam, USERINFO, + return DB::Setting::GetEx(wParam, USERINFO, cgs->szModule, cgs->szSetting, cgs->pValue, cgs->pValue->type); } diff --git a/plugins/UserInfoEx/src/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp index 3888dd7ba9..eb366250f3 100644 --- a/plugins/UserInfoEx/src/svc_email.cpp +++ b/plugins/UserInfoEx/src/svc_email.cpp @@ -84,7 +84,7 @@ static INT_PTR MenuCommand(WPARAM wParam,LPARAM lParam) __try { - val = Get((MCONTACT)wParam); + val = Get(wParam); if (val) { LPSTR szUrl; INT_PTR len; @@ -126,8 +126,8 @@ static INT_PTR MenuCommand(WPARAM wParam,LPARAM lParam) static int OnCListApplyIcons(WPARAM wParam, LPARAM lParam) { - LPSTR val = Get((MCONTACT)wParam); - ExtraIcon_SetIcon(ghExtraIconSvc, (MCONTACT)wParam, (val) ? ICO_BTN_EMAIL : 0); + LPSTR val = Get(wParam); + ExtraIcon_SetIcon(ghExtraIconSvc, wParam, (val) ? ICO_BTN_EMAIL : 0); mir_free(val); return 0; } @@ -163,7 +163,7 @@ static int OnContactSettingChanged(MCONTACT hContact, DBCONTACTWRITESETTING* pdb static int OnPreBuildMenu(WPARAM wParam, LPARAM lParam) { - LPSTR val = Get((MCONTACT)wParam); + LPSTR val = Get(wParam); Menu_ShowItem(ghMenuItem, val != NULL); mir_free(val); return 0; diff --git a/plugins/UserInfoEx/src/svc_homepage.cpp b/plugins/UserInfoEx/src/svc_homepage.cpp index d5a1d8d5fd..63c6f6afb2 100644 --- a/plugins/UserInfoEx/src/svc_homepage.cpp +++ b/plugins/UserInfoEx/src/svc_homepage.cpp @@ -68,7 +68,7 @@ static LPSTR Get(MCONTACT hContact) static INT_PTR MenuCommand(WPARAM wParam, LPARAM lParam) { - LPSTR szUrl = Get((MCONTACT)wParam); + LPSTR szUrl = Get(wParam); if (szUrl) { CallService(MS_UTILS_OPENURL, 1, (LPARAM)szUrl); mir_free(szUrl); @@ -127,7 +127,7 @@ static int OnContactSettingChanged(MCONTACT hContact, DBCONTACTWRITESETTING* pdb static int OnPreBuildMenu(WPARAM wParam, LPARAM lParam) { - LPSTR val = Get((MCONTACT)wParam); + LPSTR val = Get(wParam); Menu_ShowItem(ghMenuItem, val != 0); mir_free(val); return 0; diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp index e2022e5982..31195555a1 100644 --- a/plugins/UserInfoEx/src/svc_refreshci.cpp +++ b/plugins/UserInfoEx/src/svc_refreshci.cpp @@ -840,13 +840,13 @@ static int OnContactAdded(WPARAM wParam, LPARAM lParam) { try { - DWORD dwStmp = db_get_dw((MCONTACT)wParam, USERINFO, SET_CONTACT_ADDEDTIME, 0); + DWORD dwStmp = db_get_dw(wParam, USERINFO, SET_CONTACT_ADDEDTIME, 0); if (!dwStmp) { MTime mt; mt.GetLocalTime(); - mt.DBWriteStamp((MCONTACT)wParam, USERINFO, SET_CONTACT_ADDEDTIME); + mt.DBWriteStamp(wParam, USERINFO, SET_CONTACT_ADDEDTIME); // create updater, if not yet exists if (!ContactUpdater) @@ -858,7 +858,7 @@ static int OnContactAdded(WPARAM wParam, LPARAM lParam) ContactUpdater->AddIfDontHave( (ContactUpdater->Size() > 0) ? max(ContactUpdater->Get(ContactUpdater->Size() - 1)->check_time + 15000, 4000) - : 4000, (MCONTACT)wParam); + : 4000, wParam); } } catch(...) diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp index ca075925d0..200ded8715 100644 --- a/plugins/UserInfoEx/src/svc_reminder.cpp +++ b/plugins/UserInfoEx/src/svc_reminder.cpp @@ -727,7 +727,7 @@ static INT_PTR CheckService(WPARAM, LPARAM) static INT_PTR BackupBirthdayService(WPARAM wParam, LPARAM lParam) { - MCONTACT hContact = (MCONTACT)wParam; + MCONTACT hContact = wParam; MAnnivDate mdb; if (hContact) { diff --git a/plugins/UserInfoEx/src/svc_timezone.cpp b/plugins/UserInfoEx/src/svc_timezone.cpp index f9341d1543..e1027f4b6a 100644 --- a/plugins/UserInfoEx/src/svc_timezone.cpp +++ b/plugins/UserInfoEx/src/svc_timezone.cpp @@ -41,7 +41,7 @@ INT_PTR GetContactTimeZoneInformation(WPARAM wParam,LPARAM lParam) { //use new core tz interface LPTIME_ZONE_INFORMATION pTimeZoneInformation = (LPTIME_ZONE_INFORMATION)lParam; - (*pTimeZoneInformation) = *tmi.getTzi(tmi.createByContact((MCONTACT)wParam, 0)); + (*pTimeZoneInformation) = *tmi.getTzi(tmi.createByContact(wParam, 0)); return (pTimeZoneInformation == NULL); } @@ -58,7 +58,7 @@ INT_PTR GetContactLocalTime(WPARAM wParam, LPARAM lParam) { //use new core tz interface LPSYSTEMTIME pSystemTime = (LPSYSTEMTIME)lParam; - return (INT_PTR)tmi.getTimeZoneTimeByContact((MCONTACT)wParam, pSystemTime); + return (INT_PTR)tmi.getTimeZoneTimeByContact(wParam, pSystemTime); } /*********************************************************************************************************** diff --git a/plugins/UserInfoEx/src/svc_timezone_old.cpp b/plugins/UserInfoEx/src/svc_timezone_old.cpp index 1bb5a202a8..6eb85542aa 100644 --- a/plugins/UserInfoEx/src/svc_timezone_old.cpp +++ b/plugins/UserInfoEx/src/svc_timezone_old.cpp @@ -561,7 +561,7 @@ INT_PTR GetContactTimeZoneInformation_old(WPARAM wParam,LPARAM lParam) CTimeZone *pTimeZone; TIME_ZONE_INFORMATION* pTimeZoneInformation = (TIME_ZONE_INFORMATION*)lParam; - pTimeZone = GetContactTimeZone((MCONTACT)wParam); + pTimeZone = GetContactTimeZone(wParam); if (pTimeZone && pTimeZoneInformation) (*pTimeZoneInformation) = *pTimeZone; @@ -580,7 +580,7 @@ INT_PTR GetContactTimeZoneInformation_old(WPARAM wParam,LPARAM lParam) INT_PTR GetContactLocalTime_old(WPARAM wParam, LPARAM lParam) { MTime now; - now.GetLocalTime((MCONTACT)wParam); + now.GetLocalTime(wParam); LPSYSTEMTIME pSystemTime = (LPSYSTEMTIME)lParam; *pSystemTime = now.SystemTime(); -- cgit v1.2.3