From 78c0815c4118fe24ab78cce2dc48a6232dcd824a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 2 Jun 2012 20:55:18 +0000 Subject: - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@270 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/UserInfoEx/Flags/svc_countrylistext.cpp | 8 ++--- plugins/UserInfoEx/Flags/svc_flags.cpp | 44 ++++++++++++------------- plugins/UserInfoEx/Flags/svc_flagsicons.cpp | 8 ++--- 3 files changed, 30 insertions(+), 30 deletions(-) (limited to 'plugins/UserInfoEx/Flags') diff --git a/plugins/UserInfoEx/Flags/svc_countrylistext.cpp b/plugins/UserInfoEx/Flags/svc_countrylistext.cpp index 54fcb86675..71b259c7ab 100644 --- a/plugins/UserInfoEx/Flags/svc_countrylistext.cpp +++ b/plugins/UserInfoEx/Flags/svc_countrylistext.cpp @@ -301,14 +301,14 @@ INT_PTR ServiceGetCountryByNumber(WPARAM wParam,LPARAM lParam) int i; UNREFERENCED_PARAMETER(lParam); for(i=0; i=callList[i].uElapse) { + if ((uElapsed+USER_TIMER_MINIMUM)>=callList[i].uElapse) { /* call elapsed proc */ pfnBuffProc=callList[i].pfnBuffProc; lParam=callList[i].lParam; @@ -99,7 +99,7 @@ static void CALLBACK BufferedProcTimer(HWND hwnd, UINT msg, UINT idTimer, DWORD pszProcName=callList[i].pszProcName; #endif /* resize storage array */ - if((i+1)pszProcName=pszProcName; mir_snprintf(szDbgLine,sizeof(szDbgLine),"buffered queue: %s(0x%X)\n",pszProcName,lParam); /* all ascii */ OutputDebugStringA(szDbgLine); - if(!idBufferedTimer) { + if (!idBufferedTimer) { mir_snprintf(szDbgLine,sizeof(szDbgLine),"next buffered timeout: %ums\n",uElapse); /* all ascii */ OutputDebugStringA(szDbgLine); } @@ -222,7 +222,7 @@ static INT_PTR ServiceDetectContactOriginCountry(WPARAM wParam,LPARAM lParam) else if (countryNumber = (int)DB::Setting::GetWord((HANDLE)wParam,pszProto,"CompanyCountry",0)) return (INT_PTR)countryNumber; /* fallback ip detect - else if(countryNumber==0xFFFF && DBGetContactSettingByte(NULL,"Flags","UseIpToCountry",SETTING_USEIPTOCOUNTRY_DEFAULT)){ + else if(countryNumber==0xFFFF && DBGetContactSettingByte(NULL,"Flags","UseIpToCountry",SETTING_USEIPTOCOUNTRY_DEFAULT)) { countryNumber=ServiceIpToCountry(DBGetContactSettingDword((HANDLE)wParam,pszProto,"RealIP",0),0); }*/ @@ -310,7 +310,7 @@ void EnsureExtraImages() //garantieren - sicherstellen - updaten { register HANDLE hContact; //use Clist ExtraImageService? - if(!myGlobals.ExtraIconsServiceExist) { + if (!myGlobals.ExtraIconsServiceExist) { BYTE idExtraColumnNew = DB::Setting::GetByte(MODNAMEFLAGS,"ExtraImgFlagColumn",SETTING_EXTRAIMGFLAGCOLUMN_DEFAULT); if(idExtraColumnNew != gFlagsOpts.idExtraColumn) { /* clear previous column */ @@ -328,11 +328,11 @@ void EnsureExtraImages() //garantieren - sicherstellen - updaten } static void CALLBACK UpdateExtraImages(LPARAM lParam) { - if(!lParam) + if (!lParam) RemoveExtraImages(0); else EnsureExtraImages(); -/* if(!myGlobals.ExtraIconsServiceExist && !gFlagsOpts.bShowExtraImgFlag) +/* if (!myGlobals.ExtraIconsServiceExist && !gFlagsOpts.bShowExtraImgFlag) RemoveExtraImages(); else EnsureExtraImages(); */ } @@ -364,9 +364,9 @@ static int OnCListApplyIcons(WPARAM wParam,LPARAM lParam) { //hookProc (ME_DB_CONTACT_SETTINGCHANGED) - workaround for missing event from ExtraIconSvc static int OnExtraIconSvcChanged(WPARAM wParam,LPARAM lParam) { DBCONTACTWRITESETTING *dbcws=(DBCONTACTWRITESETTING*)lParam; - if((HANDLE)wParam!=NULL)return 0; - if(!lstrcmpA(dbcws->szModule, "ExtraIcons") && - !lstrcmpA(dbcws->szSetting,"Slot_Flags") ){ + if ((HANDLE)wParam!=NULL)return 0; + if (!lstrcmpA(dbcws->szModule, "ExtraIcons") && + !lstrcmpA(dbcws->szSetting,"Slot_Flags") ) { BOOL bEnable; switch (dbcws->value.type) { case DBVT_BYTE: @@ -388,7 +388,7 @@ static int OnExtraIconSvcChanged(WPARAM wParam,LPARAM lParam) { else if(bEnable && !hApplyIconHook) { hApplyIconHook = HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY, OnCListApplyIcons); } - else if(!bEnable && hApplyIconHook) { + else if (!bEnable && hApplyIconHook) { UnhookEvent(hApplyIconHook); hApplyIconHook = NULL; } CallFunctionBuffered(UpdateExtraImages,(LPARAM)bEnable,FALSE,EXTRAIMAGE_REFRESHDELAY); @@ -416,7 +416,7 @@ VOID SvcFlagsEnableExtraIcons(BYTE bColumn, BOOLEAN bUpdateDB) { LOCALE_USER_DEFAULT, LOCALE_ICOUNTRY | LOCALE_RETURN_NUMBER , (LPTSTR)&langid, sizeof(langid)/sizeof(TCHAR)); - if(!CallService(MS_UTILS_GETCOUNTRYBYNUMBER,langid,0)) langid = 1; + if (!CallService(MS_UTILS_GETCOUNTRYBYNUMBER,langid,0)) langid = 1; EXTRAICON_INFO ico = {0}; ico.cbSize = sizeof(ico); @@ -440,15 +440,15 @@ VOID SvcFlagsEnableExtraIcons(BYTE bColumn, BOOLEAN bUpdateDB) { for(int i=0;im_ID)delete p; + if (!p->m_ID)delete p; else res = gIListMW.insert(p); if(res == -1)delete p; return res; } void CALLBACK UpdateStatusIcons(LPARAM lParam) { - if(!lParam) { + if (!lParam) { /* enum all opened message windows */ for (int i = 0; i < gMsgWndList.getCount(); i++) gMsgWndList[i]->FlagsIconUpdate(); @@ -655,11 +655,11 @@ static int ExtraImgOptInit(WPARAM wParam,LPARAM lParam) ***********************************************************************************************************/ //hookProc ME_DB_CONTACT_SETTINGCHANGED static int OnContactSettingChanged(WPARAM wParam,LPARAM lParam) { - if((HANDLE)wParam==NULL) return 0; + if ((HANDLE)wParam==NULL) return 0; DBCONTACTWRITESETTING *dbcws=(DBCONTACTWRITESETTING*)lParam; /* user details update */ - if(/*!lstrcmpA(dbcws->szSetting,"RealIP") || */ + if (/*!lstrcmpA(dbcws->szSetting,"RealIP") || */ !lstrcmpA(dbcws->szSetting,SET_CONTACT_COUNTRY) || !lstrcmpA(dbcws->szSetting,SET_CONTACT_ORIGIN_COUNTRY) || !lstrcmpA(dbcws->szSetting,SET_CONTACT_COMPANY_COUNTRY)) diff --git a/plugins/UserInfoEx/Flags/svc_flagsicons.cpp b/plugins/UserInfoEx/Flags/svc_flagsicons.cpp index d01941e323..34fec69c39 100644 --- a/plugins/UserInfoEx/Flags/svc_flagsicons.cpp +++ b/plugins/UserInfoEx/Flags/svc_flagsicons.cpp @@ -126,7 +126,7 @@ static int CountryNumberToBitmapIndex(int countryNumber) if(countryNumber>BitmapIndexMap[i]) low=i+1; else high=i-1; }*/ - for( i=0; i < high; i++ ){ + for ( i=0; i < high; i++ ) { if(BitmapIndexMap[i]==countryNumber) return i; } } @@ -231,7 +231,7 @@ FIBITMAP* LoadResource(UINT ID, LPTSTR lpType) static INT_PTR ServiceLoadFlagIcon(WPARAM wParam,LPARAM lParam) { /* return handle */ - if((BOOL)lParam) { + if ((BOOL)lParam) { if(phIconHandles==NULL) return NULL; return (INT_PTR)phIconHandles[CountryNumberToIndex((int)wParam)]; } @@ -358,7 +358,7 @@ VOID InitIcons() FIP->FI_Unload(dib_mask); //convert to target resolution - if(!hbmMask || !(dib_ico = ConvertTo(dib_ico, bitDest, 0))) { + if (!hbmMask || !(dib_ico = ConvertTo(dib_ico, bitDest, 0))) { FIP->FI_Unload(dib_ico); if(hbmMask) DeleteObject(hbmMask); return; @@ -393,7 +393,7 @@ VOID InitIcons() hScrBM = FIP->FI_CreateHBITMAPFromDIB(dib_ico); FIP->FI_Unload(dib_ico); - if(!hScrBM) { + if (!hScrBM) { DeleteObject(hbmMask); return; } -- cgit v1.2.3