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/Mwclist/BkgrCfg.c | 12 ++++----- plugins/Mwclist/CLUIFrames/cluiframes.c | 44 ++++++++++++++++----------------- plugins/Mwclist/CLUIFrames/extraimage.c | 4 +-- plugins/Mwclist/CLUIFrames/statusbar.c | 4 +-- plugins/Mwclist/clc.c | 10 ++++---- plugins/Mwclist/clcidents.c | 18 +++++++------- plugins/Mwclist/clcitems.c | 40 +++++++++++++++--------------- plugins/Mwclist/clcopts.c | 28 ++++++++++----------- plugins/Mwclist/clcpaint.c | 6 ++--- plugins/Mwclist/clcutils.c | 6 ++--- plugins/Mwclist/clistopts.c | 14 +++++------ plugins/Mwclist/clistsettings.c | 14 +++++------ plugins/Mwclist/clui.c | 8 +++--- plugins/Mwclist/cluiopts.c | 18 +++++++------- plugins/Mwclist/contact.c | 10 ++++---- plugins/Mwclist/init.c | 2 +- 16 files changed, 119 insertions(+), 119 deletions(-) (limited to 'plugins/Mwclist') diff --git a/plugins/Mwclist/BkgrCfg.c b/plugins/Mwclist/BkgrCfg.c index 3bddc786af..adc96b1970 100644 --- a/plugins/Mwclist/BkgrCfg.c +++ b/plugins/Mwclist/BkgrCfg.c @@ -69,10 +69,10 @@ static INT_PTR CALLBACK DlgProcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP dat->item[indx].selColor = DBGetContactSettingDword(NULL,module, "SelBkColour", DEFAULT_SELBKCOLOUR); { DBVARIANT dbv; - if(!DBGetContactSettingString(NULL,module,"BkBitmap",&dbv)) + if (!DBGetContactSettingString(NULL,module,"BkBitmap",&dbv)) { int retval = CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)dbv.pszVal, (LPARAM)dat->item[indx].filename); - if(!retval || retval == CALLSERVICE_NOTFOUND) + if (!retval || retval == CALLSERVICE_NOTFOUND) lstrcpynA(dat->item[indx].filename, dbv.pszVal, MAX_PATH); mir_free(dbv.pszVal); } @@ -217,7 +217,7 @@ static INT_PTR CALLBACK DlgProcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP ofn.nMaxFile = sizeof(str); ofn.nMaxFileTitle = MAX_PATH; ofn.lpstrDefExt = "bmp"; - if(!GetOpenFileNameA(&ofn)) break; + if (!GetOpenFileNameA(&ofn)) break; SetDlgItemTextA(hwndDlg, IDC_FILENAME, str); } else @@ -264,12 +264,12 @@ static INT_PTR CALLBACK DlgProcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP { COLORREF col; - if((col = dat->item[indx].bkColor) == DEFAULT_BKCOLOUR) + if ((col = dat->item[indx].bkColor) == DEFAULT_BKCOLOUR) DBDeleteContactSetting(NULL, module, "BkColour"); else DBWriteContactSettingDword(NULL, module, "BkColour", col); - if((col = dat->item[indx].selColor) == DEFAULT_SELBKCOLOUR) + if ((col = dat->item[indx].selColor) == DEFAULT_SELBKCOLOUR) DBDeleteContactSetting(NULL, module, "SelBkColour"); else DBWriteContactSettingDword(NULL, module, "SelBkColour", col); @@ -279,7 +279,7 @@ static INT_PTR CALLBACK DlgProcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP int retval = CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)dat->item[indx].filename, (LPARAM)str); - if(!retval || retval == CALLSERVICE_NOTFOUND) + if (!retval || retval == CALLSERVICE_NOTFOUND) DBWriteContactSettingString(NULL, module, "BkBitmap", dat->item[indx].filename); else DBWriteContactSettingString(NULL, module, "BkBitmap", str); diff --git a/plugins/Mwclist/CLUIFrames/cluiframes.c b/plugins/Mwclist/CLUIFrames/cluiframes.c index 223a5eae8b..c6c7ba08e9 100644 --- a/plugins/Mwclist/CLUIFrames/cluiframes.c +++ b/plugins/Mwclist/CLUIFrames/cluiframes.c @@ -930,7 +930,7 @@ static int CLUIFramesModifyContextMenuForFrame(WPARAM wParam,LPARAM lParam) ModifyMItem((WPARAM)contMIFloating,(LPARAM)&mi); mi.flags=CMIM_FLAGS|CMIF_CHILDPOPUP; - if((Frames[pos].UseBorder)) mi.flags|=CMIF_CHECKED; + if ((Frames[pos].UseBorder)) mi.flags|=CMIF_CHECKED; ModifyMItem((WPARAM)contMIBorder,(LPARAM)&mi); @@ -950,7 +950,7 @@ static int CLUIFramesModifyContextMenuForFrame(WPARAM wParam,LPARAM lParam) mi.flags=CMIM_FLAGS|CMIF_CHILDPOPUP; if(Frames[pos].collapsed) mi.flags|=CMIF_CHECKED; - if((!Frames[pos].visible)||(Frames[pos].Locked)||(pos==CLUIFramesGetalClientFrame())) mi.flags|=CMIF_GRAYED; + if ((!Frames[pos].visible)||(Frames[pos].Locked)||(pos==CLUIFramesGetalClientFrame())) mi.flags|=CMIF_GRAYED; ModifyMItem((WPARAM)contMIColl,(LPARAM)&mi); } ulockfrm(); @@ -990,7 +990,7 @@ INT_PTR CLUIFramesModifyMainMenuItems(WPARAM wParam,LPARAM lParam) CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)Frames[pos].MenuHandles.MIFloating,(LPARAM)&mi); mi.flags=CMIM_FLAGS|CMIF_CHILDPOPUP; - if((Frames[pos].UseBorder)) mi.flags|=CMIF_CHECKED; + if ((Frames[pos].UseBorder)) mi.flags|=CMIF_CHECKED; CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)Frames[pos].MenuHandles.MIBorder,(LPARAM)&mi); mi.flags=CMIM_FLAGS|CMIF_CHILDPOPUP|((Frames[pos].align&alClient)?CMIF_GRAYED:0); @@ -1024,7 +1024,7 @@ INT_PTR CLUIFramesModifyMainMenuItems(WPARAM wParam,LPARAM lParam) mi.flags=CMIM_FLAGS|CMIF_CHILDPOPUP; if(Frames[pos].collapsed) mi.flags|=CMIF_CHECKED; - if((!Frames[pos].visible)||Frames[pos].Locked||(pos==CLUIFramesGetalClientFrame())) mi.flags|=CMIF_GRAYED; + if ((!Frames[pos].visible)||Frames[pos].Locked||(pos==CLUIFramesGetalClientFrame())) mi.flags|=CMIF_GRAYED; CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)Frames[pos].MenuHandles.MIColl,(LPARAM)&mi); } ulockfrm(); @@ -1051,11 +1051,11 @@ INT_PTR CLUIFramesGetFrameOptions(WPARAM wParam,LPARAM lParam) case FO_FLAGS: retval=0; if(Frames[pos].visible) retval|=F_VISIBLE; - if(!Frames[pos].collapsed) retval|=F_UNCOLLAPSED; + if (!Frames[pos].collapsed) retval|=F_UNCOLLAPSED; if(Frames[pos].Locked) retval|=F_LOCKED; if(Frames[pos].TitleBar.ShowTitleBar) retval|=F_SHOWTB; if(Frames[pos].TitleBar.ShowTitleBarTip) retval|=F_SHOWTBTIP; - if(!(GetWindowLong(Frames[pos].hWnd,GWL_STYLE)&WS_BORDER)) retval|=F_NOBORDER; + if (!(GetWindowLong(Frames[pos].hWnd,GWL_STYLE)&WS_BORDER)) retval|=F_NOBORDER; break; case FO_NAME: @@ -1191,7 +1191,7 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam,LPARAM lParam) if(lParam<0) {ulockfrm(); return -1;} retval=Frames[pos].height; Frames[pos].height=lParam; - if(!CLUIFramesFitInSize()) Frames[pos].height=retval; + if (!CLUIFramesFitInSize()) Frames[pos].height=retval; retval=Frames[pos].height; ulockfrm(); @@ -1216,7 +1216,7 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam,LPARAM lParam) return (-1); } - if((lParam&alClient)&&(CLUIFramesGetalClientFrame()>=0)) { //only one alClient frame possible + if ((lParam&alClient)&&(CLUIFramesGetalClientFrame()>=0)) { //only one alClient frame possible alclientFrame=-1;//recalc it ulockfrm(); return -1; @@ -1488,7 +1488,7 @@ INT_PTR CLUIFramesCollapseUnCollapseFrame(WPARAM wParam,LPARAM lParam) if (!Frames[FrameId].floating) { - if(!CLUIFramesFitInSize()) { + if (!CLUIFramesFitInSize()) { //cant collapse,we can resize only for heighthwndContactList==0) return -1; if (FramesSysNotStarted) return -1; if(clfrm->cbSize!=sizeof(CLISTFrame)) return -1; - if(!(TitleBarFont)) TitleBarFont=CLUILoadTitleBarFont(); + if (!(TitleBarFont)) TitleBarFont=CLUILoadTitleBarFont(); lockfrm(); if(nFramescount>=MAX_FRAMES) { ulockfrm(); return -1;} @@ -1913,7 +1913,7 @@ BOOLEAN CLUIFramesFitInSize(void) tbh=TitleBarH*btoint(Frames[clientfrm].TitleBar.ShowTitleBar); for(i=0;iContactListHeight-tbh-2) return FALSE; @@ -1938,7 +1938,7 @@ int CLUIFramesGetMinHeight() for(i=0;i=0;j--) { //move all alBottom frames i=sdarray[j].realpos; - if((Frames[i].visible)&&(!Frames[i].floating)&&(!Frames[i].needhide)&&(Frames[i].align==alBottom)) { + if ((Frames[i].visible)&&(!Frames[i].floating)&&(!Frames[i].needhide)&&(Frames[i].align==alBottom)) { curfrmtbh=(TitleBarH+GapBetweenTitlebar)*btoint(Frames[i].TitleBar.ShowTitleBar); Frames[i].wndSize.bottom=prevframebottomline-sepw; @@ -2094,7 +2094,7 @@ int CLUIFramesResize(const RECT newsize) if (sdarray!=NULL){free(sdarray);sdarray=NULL;} - for(i=0;i=nFramescount) { ulockfrm(); return -1;} if(lParam&FU_TBREDRAW) CLUIFramesForceUpdateTB(&Frames[wParam]); if(lParam&FU_FMREDRAW) CLUIFramesForceUpdateFrame(&Frames[wParam]); - //if (){} + //if () {} ulockfrm(); return 0; @@ -2193,7 +2193,7 @@ int OnFrameTitleBarBackgroundChange() if(hBmpBackground) {DeleteObject(hBmpBackground); hBmpBackground=NULL;} if(DBGetContactSettingByte(NULL,"FrameTitleBar","UseBitmap",CLCDEFAULT_USEBITMAP)) { - if(!DBGetContactSetting(NULL,"FrameTitleBar","BkBitmap",&dbv)) { + if (!DBGetContactSetting(NULL,"FrameTitleBar","BkBitmap",&dbv)) { hBmpBackground=(HBITMAP)CallService(MS_UTILS_LOADBITMAP,0,(LPARAM)dbv.pszVal); mir_free(dbv.pszVal); } @@ -2306,7 +2306,7 @@ void DrawBackGroundTTB(HWND hwnd,HDC mhdc) break; } desth=clRect.bottom -clRect.top; - for(;ytop-desth) continue; for(x=0;x0) { prevold=Frames[Framemod].height; Frames[Framemod].height=newh; - if(!CLUIFramesFitInSize()) { Frames[Framemod].height=prevold; ulockfrm();return TRUE;} + if (!CLUIFramesFitInSize()) { Frames[Framemod].height=prevold; ulockfrm();return TRUE;} Frames[Framemod].height=newh; if(newh>3) Frames[Framemod].collapsed=TRUE; diff --git a/plugins/Mwclist/CLUIFrames/extraimage.c b/plugins/Mwclist/CLUIFrames/extraimage.c index 941732c4ff..2124612a5d 100644 --- a/plugins/Mwclist/CLUIFrames/extraimage.c +++ b/plugins/Mwclist/CLUIFrames/extraimage.c @@ -297,7 +297,7 @@ void SetAllExtraIcons(HWND hwndList,HANDLE hContact) maxpr=0; //calc only needed protocols - for( i=0; i < count; i++ ) { + for ( i=0; i < count; i++ ) { if ( !IsAccountEnabled( accs[i] ) || CallProtoService( accs[i]->szModuleName, PS_GETCAPS, PFLAGNUM_2, 0 ) == 0 ) continue; ImgIndex[maxpr] = accs[i]->szModuleName; @@ -374,7 +374,7 @@ void SetAllExtraIcons(HWND hwndList,HANDLE hContact) { for (i=0;itop-desth) continue; for(x=0;xpfnClcBroadcast( INTM_NAMEORDERCHANGED, 0, 0 ); if ((HANDLE)wParam!=NULL&&!strcmp(cws->szModule,"CList")) { - if( !strcmp( cws->szSetting, "noOffline" )) + if ( !strcmp( cws->szSetting, "noOffline" )) pcli->pfnClcBroadcast( INTM_NAMEORDERCHANGED, wParam, lParam ); - else if(!strcmp(cws->szSetting,"StatusMsg")) + else if (!strcmp(cws->szSetting,"StatusMsg")) pcli->pfnClcBroadcast( INTM_STATUSMSGCHANGED, wParam, lParam ); } return 0; @@ -157,7 +157,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L else status=cacheEntry->status; shouldShow=(GetWindowLong(hwnd,GWL_STYLE)&CLS_SHOWHIDDEN || !cacheEntry->Hidden) && (!pcli->pfnIsHiddenMode(dat,status)||cacheEntry->noHiddenOffline || CallService(MS_CLIST_GETCONTACTICON,wParam,0)!=LOWORD(lParam)); //this means an offline msg is flashing, so the contact should be shown - if(!FindItem(hwnd,dat,(HANDLE)wParam,&contact,&group,NULL)) { + if (!FindItem(hwnd,dat,(HANDLE)wParam,&contact,&group,NULL)) { if(shouldShow && CallService(MS_DB_CONTACT_IS, wParam, 0)) { if(dat->selection>=0 && GetRowByIndex(dat,dat->selection,&selcontact,NULL)!=-1) hSelItem=pcli->pfnContactToHItem(selcontact); @@ -178,7 +178,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L if(contact->iImage== (WORD)lParam) break; if (sortByStatus) dat->NeedResort=1; - if(!shouldShow && !(style&CLS_NOHIDEOFFLINE) && (style&CLS_HIDEOFFLINE || group->hideOffline)) { + if (!shouldShow && !(style&CLS_NOHIDEOFFLINE) && (style&CLS_HIDEOFFLINE || group->hideOffline)) { if(dat->selection>=0 && GetRowByIndex(dat,dat->selection,&selcontact,NULL)!=-1) hSelItem=pcli->pfnContactToHItem(selcontact); RemoveItemFromGroup(hwnd,group,contact,0); @@ -189,7 +189,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L int oldflags; contact->iImage=(WORD)lParam; oldflags=contact->flags; - if(!pcli->pfnIsHiddenMode(dat,status)||cacheEntry->noHiddenOffline) contact->flags|=CONTACTF_ONLINE; + if (!pcli->pfnIsHiddenMode(dat,status)||cacheEntry->noHiddenOffline) contact->flags|=CONTACTF_ONLINE; else contact->flags&=~CONTACTF_ONLINE; if (oldflags!=contact->flags) dat->NeedResort=1; diff --git a/plugins/Mwclist/clcidents.c b/plugins/Mwclist/clcidents.c index be6be4c2d6..09a68588bc 100644 --- a/plugins/Mwclist/clcidents.c +++ b/plugins/Mwclist/clcidents.c @@ -46,7 +46,7 @@ int GetRowsPriorTo(struct ClcGroup *group,struct ClcGroup *subgroup,int contactI int count=0; group->scanIndex=0; - for(;;) { + for (;;) { if(group->scanIndex==group->cl.count) { group=group->parent; if(group==NULL) break; @@ -131,7 +131,7 @@ void ClearClcContactCache(struct ClcData *dat,HANDLE hContact) OutputDebugStringA(buf); } } - if(!IsHContactGroup(hContact)&&!IsHContactInfo(hContact)) + if (!IsHContactGroup(hContact)&&!IsHContactInfo(hContact)) { cacheEntry=GetCLCFullCacheEntry(dat,hContact); if (cacheEntry!=NULL) @@ -142,7 +142,7 @@ void ClearClcContactCache(struct ClcData *dat,HANDLE hContact) void SetClcContactCacheItem(struct ClcData *dat,HANDLE hContact,void *contact) { pdisplayNameCacheEntry cacheEntry; - if(!IsHContactGroup(hContact)&&!IsHContactInfo(hContact)) + if (!IsHContactGroup(hContact)&&!IsHContactInfo(hContact)) { cacheEntry=GetCLCFullCacheEntry(dat,hContact); if (cacheEntry!=NULL) @@ -205,25 +205,25 @@ int FindItem(HWND hwnd,struct ClcData *dat,HANDLE hItem,struct ClcContact **cont group=&dat->list; - for(;;) { + for (;;) { if(group->scanIndex==group->cl.count) { struct ClcGroup *tgroup; group=group->parent; if(group==NULL) break; nowVisible=1; for(tgroup=group;tgroup;tgroup=tgroup->parent) - if(!group->expanded) {nowVisible=0; break;} + if (!group->expanded) {nowVisible=0; break;} group->scanIndex++; continue; } if(nowVisible) index++; - if((IsHContactGroup(hItem) && group->cl.items[group->scanIndex]->type==CLCIT_GROUP && ((UINT_PTR)hItem&~HCONTACT_ISGROUP)==group->cl.items[group->scanIndex]->groupId) || + if ((IsHContactGroup(hItem) && group->cl.items[group->scanIndex]->type==CLCIT_GROUP && ((UINT_PTR)hItem&~HCONTACT_ISGROUP)==group->cl.items[group->scanIndex]->groupId) || (IsHContactContact(hItem) && group->cl.items[group->scanIndex]->type==CLCIT_CONTACT && group->cl.items[group->scanIndex]->hContact==hItem) || (IsHContactInfo(hItem) && group->cl.items[group->scanIndex]->type==CLCIT_INFO && group->cl.items[group->scanIndex]->hContact==(HANDLE)((UINT_PTR)hItem&~HCONTACT_ISINFO))) { if(isVisible) { - if(!nowVisible) *isVisible=0; + if (!nowVisible) *isVisible=0; else { - if((index+1)*dat->rowHeightyScroll) *isVisible=0; + if ((index+1)*dat->rowHeightyScroll) *isVisible=0; else { RECT clRect; GetClientRect(hwnd,&clRect); @@ -283,7 +283,7 @@ int GetRowByIndex(struct ClcData *dat,int testindex,struct ClcContact **contact, // }else { group->scanIndex=0; - for(;;) { + for (;;) { if(group->scanIndex==group->cl.count) { group=group->parent; if(group==NULL) break; diff --git a/plugins/Mwclist/clcitems.c b/plugins/Mwclist/clcitems.c index 9a0f1548f3..f2aec5029e 100644 --- a/plugins/Mwclist/clcitems.c +++ b/plugins/Mwclist/clcitems.c @@ -225,21 +225,21 @@ void AddContactToTree(HWND hwnd,struct ClcData *dat,HANDLE hContact,int updateTo int i,len; DWORD groupFlags; TCHAR *szGroupName; - if(!(style&CLS_HIDEEMPTYGROUPS)) {/*mir_free(dbv.pszVal);*/return;} + if (!(style&CLS_HIDEEMPTYGROUPS)) {/*mir_free(dbv.pszVal);*/return;} if(checkHideOffline && pcli->pfnIsHiddenMode(dat,status)) { for(i=1;;i++) { szGroupName = pcli->pfnGetGroupName(i,&groupFlags); if(szGroupName==NULL) {/*mir_free(dbv.pszVal);*/ return;} //never happens - if(!lstrcmp(szGroupName,cacheEntry->szGroup)) break; + if (!lstrcmp(szGroupName,cacheEntry->szGroup)) break; } if(groupFlags&GROUPF_HIDEOFFLINE) {/*mir_free(dbv.pszVal);*/ return;} } for(i=1;;i++) { szGroupName=pcli->pfnGetGroupName(i,&groupFlags); if(szGroupName==NULL) {/*mir_free(dbv.pszVal);*/ return;} //never happens - if(!lstrcmp(szGroupName,cacheEntry->szGroup)) break; + if (!lstrcmp(szGroupName,cacheEntry->szGroup)) break; len=lstrlen(szGroupName); - if(!_tcsncmp(szGroupName,cacheEntry->szGroup,len) && cacheEntry->szGroup[len]=='\\') + if (!_tcsncmp(szGroupName,cacheEntry->szGroup,len) && cacheEntry->szGroup[len]=='\\') AddGroup(hwnd,dat,szGroupName,groupFlags,i,1); } group=AddGroup(hwnd,dat,cacheEntry->szGroup,groupFlags,i,1); @@ -289,10 +289,10 @@ void DeleteItemFromTree(HWND hwnd,HANDLE hItem) ClearRowByIndexCache(); dat->NeedResort=1; - if(!FindItem(hwnd,dat,hItem,&contact,&group,NULL)) { + if (!FindItem(hwnd,dat,hItem,&contact,&group,NULL)) { DBVARIANT dbv; int i,nameOffset; - if(!IsHContactContact(hItem)) return; + if (!IsHContactContact(hItem)) return; ClearClcContactCache(dat,hItem); if(DBGetContactSettingTString(hItem,"CList","Group",&dbv)) return; @@ -304,7 +304,7 @@ void DeleteItemFromTree(HWND hwnd,HANDLE hItem) if(group->scanIndex==group->cl.count) break; if(group->cl.items[i]->type==CLCIT_GROUP) { int len=lstrlen(group->cl.items[i]->szText); - if(!_tcsncmp(group->cl.items[i]->szText,dbv.ptszVal+nameOffset,len) && (dbv.ptszVal[nameOffset+len]=='\\' || dbv.pszVal[nameOffset+len]=='\0')) { + if (!_tcsncmp(group->cl.items[i]->szText,dbv.ptszVal+nameOffset,len) && (dbv.ptszVal[nameOffset+len]=='\\' || dbv.pszVal[nameOffset+len]=='\0')) { group->totalMembers--; if(dbv.pszVal[nameOffset+len]=='\0') break; } @@ -375,14 +375,14 @@ void RebuildEntireList(HWND hwnd,struct ClcData *dat) if(group!=NULL) { group->totalMembers++; - if(!(style&CLS_NOHIDEOFFLINE) && (style&CLS_HIDEOFFLINE || group->hideOffline)) { + if (!(style&CLS_NOHIDEOFFLINE) && (style&CLS_HIDEOFFLINE || group->hideOffline)) { //szProto=(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,(WPARAM)hContact,0); if(cacheEntry->szProto==NULL) { - if(!pcli->pfnIsHiddenMode(dat,ID_STATUS_OFFLINE)||cacheEntry->noHiddenOffline) + if (!pcli->pfnIsHiddenMode(dat,ID_STATUS_OFFLINE)||cacheEntry->noHiddenOffline) cont=AddContactToGroup(dat,group,cacheEntry); } else - if(!pcli->pfnIsHiddenMode(dat,cacheEntry->status)||cacheEntry->noHiddenOffline) + if (!pcli->pfnIsHiddenMode(dat,cacheEntry->status)||cacheEntry->noHiddenOffline) cont=AddContactToGroup(dat,group,cacheEntry); } else cont=AddContactToGroup(dat,group,cacheEntry); @@ -401,7 +401,7 @@ void RebuildEntireList(HWND hwnd,struct ClcData *dat) if(style&CLS_HIDEEMPTYGROUPS) { group=&dat->list; group->scanIndex=0; - for(;;) { + for (;;) { if(group->scanIndex==group->cl.count) { group=group->parent; if(group==NULL) break; @@ -441,7 +441,7 @@ int GetNewSelection(struct ClcGroup *group, int selection, int direction) return 0; } group->scanIndex=0; - for(;;) { + for (;;) { if(group->scanIndex==group->cl.count) { group=group->parent; if(group==NULL) break; @@ -474,7 +474,7 @@ int GetGroupContentsCount(struct ClcGroup *group,int visibleOnly) struct ClcGroup *topgroup=group; group->scanIndex=0; - for(;;) { + for (;;) { if(group->scanIndex==group->cl.count) { if(group==topgroup) break; group=group->parent; @@ -568,7 +568,7 @@ void SaveStateAndRebuildList(HWND hwnd,struct ClcData *dat) group = &dat->list; group->scanIndex=0; - for(;;) { + for (;;) { if(group->scanIndex==group->cl.count) { group=group->parent; if(group==NULL) break; @@ -576,7 +576,7 @@ void SaveStateAndRebuildList(HWND hwnd,struct ClcData *dat) else if(group->cl.items[group->scanIndex]->type==CLCIT_GROUP) { group=group->cl.items[group->scanIndex]->group; group->scanIndex=0; - if(++savedGroupCount>savedGroupAlloced) { + if (++savedGroupCount>savedGroupAlloced) { savedGroupAlloced+=allocstep; savedGroup=(struct SavedGroupState_t*)mir_realloc(savedGroup,sizeof(struct SavedGroupState_t)*savedGroupAlloced); } @@ -585,7 +585,7 @@ void SaveStateAndRebuildList(HWND hwnd,struct ClcData *dat) continue; } else if(group->cl.items[group->scanIndex]->type==CLCIT_CONTACT) { - if(++savedContactCount>savedContactAlloced) { + if (++savedContactCount>savedContactAlloced) { savedContactAlloced+=allocstep; savedContact=(struct SavedContactState_t*)mir_realloc(savedContact,sizeof(struct SavedContactState_t)*savedContactAlloced); } @@ -597,7 +597,7 @@ void SaveStateAndRebuildList(HWND hwnd,struct ClcData *dat) int l; for (l=0; lcl.items[group->scanIndex]->SubAllocated; l++) { - if(++savedContactCount>savedContactAlloced) { + if (++savedContactCount>savedContactAlloced) { savedContactAlloced+=allocstep; savedContact=(struct SavedContactState_t*)mir_realloc(savedContact,sizeof(struct SavedContactState_t)*savedContactAlloced); } @@ -608,7 +608,7 @@ void SaveStateAndRebuildList(HWND hwnd,struct ClcData *dat) } } else if(group->cl.items[group->scanIndex]->type==CLCIT_INFO) { - if(++savedInfoCount>savedInfoAlloced) { + if (++savedInfoCount>savedInfoAlloced) { savedInfoAlloced+=allocstep; savedInfo=(struct SavedInfoState_t*)mir_realloc(savedInfo,sizeof(struct SavedInfoState_t)*savedInfoAlloced); } @@ -624,7 +624,7 @@ void SaveStateAndRebuildList(HWND hwnd,struct ClcData *dat) group=&dat->list; group->scanIndex=0; - for(;;) { + for (;;) { if(group->scanIndex==group->cl.count) { group=group->parent; if(group==NULL) break; @@ -665,7 +665,7 @@ void SaveStateAndRebuildList(HWND hwnd,struct ClcData *dat) for(i=0;ilist; else { - if(!FindItem(hwnd,dat,(HANDLE)(savedInfo[i].parentId|HCONTACT_ISGROUP),&contact,NULL,NULL)) continue; + if (!FindItem(hwnd,dat,(HANDLE)(savedInfo[i].parentId|HCONTACT_ISGROUP),&contact,NULL,NULL)) continue; group=contact->group; } j=AddInfoItemToGroup(group,savedInfo[i].contact.flags,_T("")); diff --git a/plugins/Mwclist/clcopts.c b/plugins/Mwclist/clcopts.c index 11fe5c1b86..bea2252081 100644 --- a/plugins/Mwclist/clcopts.c +++ b/plugins/Mwclist/clcopts.c @@ -172,7 +172,7 @@ static DWORD MakeCheckBoxTreeFlags(HWND hwndTree) tvi.hItem=TreeView_GetRoot(hwndTree); while(tvi.hItem) { TreeView_GetItem(hwndTree,&tvi); - if(((tvi.state&TVIS_STATEIMAGEMASK)>>12==2)) flags|=tvi.lParam; + if (((tvi.state&TVIS_STATEIMAGEMASK)>>12==2)) flags|=tvi.lParam; tvi.hItem=TreeView_GetNextSibling(hwndTree,tvi.hItem); } return flags; @@ -268,14 +268,14 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam EnableWindow(GetDlgItem(hwndDlg,IDC_SMOOTHTIME),IsDlgButtonChecked(hwndDlg,IDC_NOTNOSMOOTHSCROLLING)); if(LOWORD(wParam)==IDC_GREYOUT) EnableWindow(GetDlgItem(hwndDlg,IDC_GREYOUTOPTS),IsDlgButtonChecked(hwndDlg,IDC_GREYOUT)); - if((LOWORD(wParam)==IDC_LEFTMARGIN || LOWORD(wParam)==IDC_SMOOTHTIME || LOWORD(wParam)==IDC_GROUPINDENT) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus())) return 0; + if ((LOWORD(wParam)==IDC_LEFTMARGIN || LOWORD(wParam)==IDC_SMOOTHTIME || LOWORD(wParam)==IDC_GROUPINDENT) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus())) return 0; SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); break; case WM_NOTIFY: switch(((LPNMHDR)lParam)->idFrom) { case IDC_GREYOUTOPTS: case IDC_HIDEOFFLINEOPTS: - if(((LPNMHDR)lParam)->code==NM_CLICK) { + if (((LPNMHDR)lParam)->code==NM_CLICK) { TVHITTESTINFO hti; hti.pt.x=(short)LOWORD(GetMessagePos()); hti.pt.y=(short)HIWORD(GetMessagePos()); @@ -299,7 +299,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam { int i; DWORD exStyle=0; for(i=0;i < SIZEOF(checkBoxToStyleEx);i++) - if((IsDlgButtonChecked(hwndDlg,checkBoxToStyleEx[i].id)==0)==checkBoxToStyleEx[i].not) + if ((IsDlgButtonChecked(hwndDlg,checkBoxToStyleEx[i].id)==0)==checkBoxToStyleEx[i].not) exStyle|=checkBoxToStyleEx[i].flag; DBWriteContactSettingDword(NULL,"CLC","ExStyle",exStyle); } @@ -348,7 +348,7 @@ static INT_PTR CALLBACK DlgProcStatusBarBkgOpts(HWND hwndDlg, UINT msg, WPARAM w SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_SETDEFAULTCOLOUR,0,CLCDEFAULT_SELBKCOLOUR); SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_SETCOLOUR,0,DBGetContactSettingDword(NULL,"StatusBar","SelBkColour",CLCDEFAULT_SELBKCOLOUR)); { DBVARIANT dbv; - if(!DBGetContactSettingString(NULL,"StatusBar","BkBitmap",&dbv)) { + if (!DBGetContactSettingString(NULL,"StatusBar","BkBitmap",&dbv)) { SetDlgItemTextA(hwndDlg,IDC_FILENAME,dbv.pszVal); if (ServiceExists(MS_UTILS_PATHTOABSOLUTE)) { char szPath[MAX_PATH]; @@ -411,7 +411,7 @@ static INT_PTR CALLBACK DlgProcStatusBarBkgOpts(HWND hwndDlg, UINT msg, WPARAM w ofn.nMaxFile = SIZEOF(str); ofn.nMaxFileTitle = MAX_PATH; ofn.lpstrDefExt = "bmp"; - if(!GetOpenFileNameA(&ofn)) break; + if (!GetOpenFileNameA(&ofn)) break; SetDlgItemTextA(hwndDlg,IDC_FILENAME,str); } else if(LOWORD(wParam)==IDC_FILENAME && HIWORD(wParam)!=EN_CHANGE) break; @@ -487,7 +487,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_SETDEFAULTCOLOUR,0,CLCDEFAULT_SELBKCOLOUR); SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_SETCOLOUR,0,DBGetContactSettingDword(NULL,"CLC","SelBkColour",CLCDEFAULT_SELBKCOLOUR)); { DBVARIANT dbv; - if(!DBGetContactSettingString(NULL,"CLC","BkBitmap",&dbv)) { + if (!DBGetContactSettingString(NULL,"CLC","BkBitmap",&dbv)) { SetDlgItemTextA(hwndDlg,IDC_FILENAME,dbv.pszVal); if (ServiceExists(MS_UTILS_PATHTOABSOLUTE)) { char szPath[MAX_PATH]; @@ -542,7 +542,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, ofn.nMaxFile = SIZEOF(str); ofn.nMaxFileTitle = MAX_PATH; ofn.lpstrDefExt = "bmp"; - if(!GetOpenFileNameA(&ofn)) break; + if (!GetOpenFileNameA(&ofn)) break; SetDlgItemTextA(hwndDlg,IDC_FILENAME,str); } else if(LOWORD(wParam)==IDC_FILENAME && HIWORD(wParam)!=EN_CHANGE) break; @@ -643,7 +643,7 @@ static const int fontListOrder[FONTID_MAX+1]={FONTID_CONTACTS,FONTID_INVIS,FONTI static int CALLBACK EnumFontsProc(ENUMLOGFONTEX *lpelfe,NEWTEXTMETRICEX *lpntme,int FontType,LPARAM lParam) { - if(!IsWindow((HWND)lParam)) return FALSE; + if (!IsWindow((HWND)lParam)) return FALSE; if(SendMessage((HWND)lParam,CB_FINDSTRINGEXACT,-1,(LPARAM)lpelfe->elfLogFont.lfFaceName)==CB_ERR) SendMessage((HWND)lParam,CB_ADDSTRING,0,(LPARAM)lpelfe->elfLogFont.lfFaceName); return TRUE; @@ -708,7 +708,7 @@ static INT_PTR CALLBACK DlgProcClcTextOpts(HWND hwndDlg, UINT msg, WPARAM wParam hFontSample=NULL; SetDlgItemTextA(hwndDlg,IDC_SAMPLE,"Sample"); TranslateDialogDefault(hwndDlg); - if(!SendMessage(GetParent(hwndDlg),PSM_ISEXPERT,0,0)) + if (!SendMessage(GetParent(hwndDlg),PSM_ISEXPERT,0,0)) SwitchTextDlgToMode(hwndDlg,0); mir_forkthread(FillFontListThread,hwndDlg); { @@ -817,7 +817,7 @@ static INT_PTR CALLBACK DlgProcClcTextOpts(HWND hwndDlg, UINT msg, WPARAM wParam break; } case WM_CTLCOLORSTATIC: - if((HWND)lParam==GetDlgItem(hwndDlg,IDC_SAMPLE)) { + if ((HWND)lParam==GetDlgItem(hwndDlg,IDC_SAMPLE)) { SetTextColor((HDC)wParam,SendDlgItemMessage(hwndDlg,IDC_COLOUR,CPM_GETCOLOUR,0,0)); SetBkColor((HDC)wParam,GetSysColor(COLOR_3DFACE)); return (INT_PTR)GetSysColorBrush(COLOR_3DFACE); @@ -966,7 +966,7 @@ static INT_PTR CALLBACK DlgProcClcTextOpts(HWND hwndDlg, UINT msg, WPARAM wParam case M_GUESSSAMEASBOXES: //guess suitable values for the 'same as' checkboxes for fontId wParam fontSettings[wParam].sameAsFlags=0; if(fontSettings[wParam].sameAs==0xFF) break; - if(!lstrcmp(fontSettings[wParam].szFace,fontSettings[fontSettings[wParam].sameAs].szFace) && + if (!lstrcmp(fontSettings[wParam].szFace,fontSettings[fontSettings[wParam].sameAs].szFace) && fontSettings[wParam].charset==fontSettings[fontSettings[wParam].sameAs].charset) fontSettings[wParam].sameAsFlags|=SAMEASF_FACE; if(fontSettings[wParam].size==fontSettings[fontSettings[wParam].sameAs].size) @@ -1000,7 +1000,7 @@ static INT_PTR CALLBACK DlgProcClcTextOpts(HWND hwndDlg, UINT msg, WPARAM wParam if(HIWORD(wParam)!=CBN_SELCHANGE) return FALSE; if(SendDlgItemMessage(hwndDlg,IDC_SAMEAS,CB_GETITEMDATA,SendDlgItemMessage(hwndDlg,IDC_SAMEAS,CB_GETCURSEL,0,0),0)==fontId) SendDlgItemMessage(hwndDlg,IDC_SAMEAS,CB_SETCURSEL,0,0); - if(!SendMessage(GetParent(hwndDlg),PSM_ISEXPERT,0,0)) { + if (!SendMessage(GetParent(hwndDlg),PSM_ISEXPERT,0,0)) { int sameAs=SendDlgItemMessage(hwndDlg,IDC_SAMEAS,CB_GETITEMDATA,SendDlgItemMessage(hwndDlg,IDC_SAMEAS,CB_GETCURSEL,0,0),0); if(sameAs!=0xFF) SendMessage(hwndDlg,M_LOADFONT,sameAs,0); SendMessage(hwndDlg,M_SAVEFONT,fontId,0); @@ -1027,7 +1027,7 @@ static INT_PTR CALLBACK DlgProcClcTextOpts(HWND hwndDlg, UINT msg, WPARAM wParam case IDC_UNDERLINE: case IDC_COLOUR: SendMessage(hwndDlg,M_SAVEFONT,fontId,0); - if(!SendMessage(GetParent(hwndDlg),PSM_ISEXPERT,0,0)) { + if (!SendMessage(GetParent(hwndDlg),PSM_ISEXPERT,0,0)) { SendMessage(hwndDlg,M_GUESSSAMEASBOXES,fontId,0); SendMessage(hwndDlg,M_REFRESHSAMEASBOXES,fontId,0); } diff --git a/plugins/Mwclist/clcpaint.c b/plugins/Mwclist/clcpaint.c index a150c30836..670da591f0 100644 --- a/plugins/Mwclist/clcpaint.c +++ b/plugins/Mwclist/clcpaint.c @@ -270,7 +270,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) } break; } - for(;ytop-desth) continue; for(x=0;xtype==CLCIT_CONTACT) || + if ((style&CLS_CHECKBOXES && Drawing->type==CLCIT_CONTACT) || (style&CLS_GROUPCHECKBOXES && Drawing->type==CLCIT_GROUP) || (Drawing->type==CLCIT_INFO && Drawing->flags&CLCIIF_CHECKBOX)) checkboxWidth=dat->checkboxSize+2; @@ -698,7 +698,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint) SelectObject(hdcMem,hoBrush); DeleteObject(hBrush); } - if(!grey) + if (!grey) BitBlt(hdc,rcPaint->left,rcPaint->top,rcPaint->right-rcPaint->left,rcPaint->bottom-rcPaint->top,hdcMem,rcPaint->left,rcPaint->top,SRCCOPY); //DeleteDC(hdcMem); if(hBrushAlternateGrey) DeleteObject(hBrushAlternateGrey); diff --git a/plugins/Mwclist/clcutils.c b/plugins/Mwclist/clcutils.c index 5a7aa3d992..35ddf0ccdc 100644 --- a/plugins/Mwclist/clcutils.c +++ b/plugins/Mwclist/clcutils.c @@ -177,11 +177,11 @@ void ScrollTo(HWND hwnd,struct ClcData *dat,int desty,int noSmooth) if(desty>maxy) desty=maxy; if(desty<0) desty=0; if(abs(desty-dat->yScroll)<4) noSmooth=1; - if(!noSmooth && dat->exStyle&CLS_EX_NOSMOOTHSCROLLING) noSmooth=1; + if (!noSmooth && dat->exStyle&CLS_EX_NOSMOOTHSCROLLING) noSmooth=1; previousy=dat->yScroll; - if(!noSmooth) { + if (!noSmooth) { startTick=GetTickCount(); - for(;;) { + for (;;) { nowTick=GetTickCount(); if(nowTick>=startTick+dat->scrollTime) break; dat->yScroll=oldy+(desty-oldy)*(int)(nowTick-startTick)/dat->scrollTime; diff --git a/plugins/Mwclist/clistopts.c b/plugins/Mwclist/clistopts.c index 07cef251af..4be31595a5 100644 --- a/plugins/Mwclist/clistopts.c +++ b/plugins/Mwclist/clistopts.c @@ -94,8 +94,8 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP EnableWindow(GetDlgItem(hwndDlg,IDC_HIDETIME),IsDlgButtonChecked(hwndDlg,IDC_AUTOHIDE)); EnableWindow(GetDlgItem(hwndDlg,IDC_HIDETIMESPIN),IsDlgButtonChecked(hwndDlg,IDC_AUTOHIDE)); { DWORD caps=CallService(MS_CLUI_GETCAPS,CLUICAPS_FLAGS1,0); - if(!(caps&CLUIF_HIDEEMPTYGROUPS)) ShowWindow(GetDlgItem(hwndDlg,IDC_HIDEEMPTYGROUPS),SW_HIDE); - if(!(caps&CLUIF_DISABLEGROUPS)) ShowWindow(GetDlgItem(hwndDlg,IDC_DISABLEGROUPS),SW_HIDE); + if (!(caps&CLUIF_HIDEEMPTYGROUPS)) ShowWindow(GetDlgItem(hwndDlg,IDC_HIDEEMPTYGROUPS),SW_HIDE); + if (!(caps&CLUIF_DISABLEGROUPS)) ShowWindow(GetDlgItem(hwndDlg,IDC_DISABLEGROUPS),SW_HIDE); if(caps&CLUIF_HASONTOPOPTION) ShowWindow(GetDlgItem(hwndDlg,IDC_ONTOP),SW_HIDE); if(caps&CLUIF_HASAUTOHIDEOPTION) { ShowWindow(GetDlgItem(hwndDlg,IDC_AUTOHIDE),SW_HIDE); @@ -148,7 +148,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_SETCURSEL,item,0); } } - if(-1==(int)SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_GETCURSEL,0,0)) + if (-1==(int)SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_GETCURSEL,0,0)) SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_SETCURSEL,0,0); SendDlgItemMessage(hwndDlg,IDC_BLINKSPIN,UDM_SETBUDDY,(WPARAM)GetDlgItem(hwndDlg,IDC_BLINKTIME),0); // set buddy SendDlgItemMessage(hwndDlg,IDC_BLINKSPIN,UDM_SETRANGE,0,MAKELONG(0x3FFF,250)); @@ -165,9 +165,9 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP EnableWindow(GetDlgItem(hwndDlg,IDC_CYCLETIMESPIN),IsDlgButtonChecked(hwndDlg,IDC_CYCLE)); EnableWindow(GetDlgItem(hwndDlg,IDC_ALWAYSMULTI),IsDlgButtonChecked(hwndDlg,IDC_MULTITRAY)); } - if((LOWORD(wParam)==IDC_HIDETIME || LOWORD(wParam)==IDC_CYCLETIME) && HIWORD(wParam)!=EN_CHANGE) break; + if ((LOWORD(wParam)==IDC_HIDETIME || LOWORD(wParam)==IDC_CYCLETIME) && HIWORD(wParam)!=EN_CHANGE) break; if(LOWORD(wParam)==IDC_PRIMARYSTATUS && HIWORD(wParam)!=CBN_SELCHANGE) break; - if((LOWORD(wParam)==IDC_HIDETIME || LOWORD(wParam)==IDC_CYCLETIME) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus())) return 0; + if ((LOWORD(wParam)==IDC_HIDETIME || LOWORD(wParam)==IDC_CYCLETIME) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus())) return 0; if (LOWORD(wParam)==IDC_BLINKTIME && HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()) return 0; // dont make apply enabled during buddy set crap SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); break; @@ -181,11 +181,11 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP { DWORD caps=CallService(MS_CLUI_GETCAPS,CLUICAPS_FLAGS1,0); if(caps&CLUIF_HIDEEMPTYGROUPS) DBWriteContactSettingByte(NULL,"CList","HideEmptyGroups",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_HIDEEMPTYGROUPS)); if(caps&CLUIF_DISABLEGROUPS) DBWriteContactSettingByte(NULL,"CList","UseGroups",(BYTE)!IsDlgButtonChecked(hwndDlg,IDC_DISABLEGROUPS)); - if(!(caps&CLUIF_HASONTOPOPTION)) { + if (!(caps&CLUIF_HASONTOPOPTION)) { DBWriteContactSettingByte(NULL,"CList","OnTop",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_ONTOP)); SetWindowPos(pcli->hwndContactList,IsDlgButtonChecked(hwndDlg,IDC_ONTOP)?HWND_TOPMOST:HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); } - if(!(caps&CLUIF_HASAUTOHIDEOPTION)) { + if (!(caps&CLUIF_HASAUTOHIDEOPTION)) { DBWriteContactSettingByte(NULL,"CList","AutoHide",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_AUTOHIDE)); DBWriteContactSettingWord(NULL,"CList","HideTime",(WORD)SendDlgItemMessage(hwndDlg,IDC_HIDETIMESPIN,UDM_GETPOS,0,0)); } diff --git a/plugins/Mwclist/clistsettings.c b/plugins/Mwclist/clistsettings.c index 01207fb503..ba3ef3befa 100644 --- a/plugins/Mwclist/clistsettings.c +++ b/plugins/Mwclist/clistsettings.c @@ -74,7 +74,7 @@ void FreeDisplayNameCache(SortedList *list) { int i; - for( i=0; i < list->realCount; i++) { + for ( i=0; i < list->realCount; i++) { FreeDisplayNameCacheItem(list->items[i] ); mir_free(list->items[i]); } @@ -333,7 +333,7 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam) SortContacts(); } } - if(!strcmp(cws->szModule,"CList")) { + if (!strcmp(cws->szModule,"CList")) { /* sprintf(buf,"CHANGE: module:CList setting:%s %s\r\n",cws->szSetting,cws->value.pszVal); OutputDebugStringA(buf); @@ -343,22 +343,22 @@ int ContactSettingChanged(WPARAM wParam,LPARAM lParam) if(pdnce->name == NULL||(!strcmp(cws->szSetting,"MyHandle")) ) InvalidateDisplayNameCacheEntryByPDNE((HANDLE)wParam,pdnce,cws->value.type); - if((!strcmp(cws->szSetting,"Group")) ) + if ((!strcmp(cws->szSetting,"Group")) ) InvalidateDisplayNameCacheEntryByPDNE((HANDLE)wParam,pdnce,cws->value.type); - if(!strcmp(cws->szSetting,"Hidden")) { + if (!strcmp(cws->szSetting,"Hidden")) { InvalidateDisplayNameCacheEntryByPDNE((HANDLE)wParam,pdnce,cws->value.type); if(cws->value.type == DBVT_DELETED || cws->value.bVal == 0) { char *szProto=(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,wParam,0); ChangeContactIcon((HANDLE)wParam,ExtIconFromStatusMode((HANDLE)wParam,szProto,szProto == NULL?ID_STATUS_OFFLINE:DBGetContactSettingWord((HANDLE)wParam,szProto,"Status",ID_STATUS_OFFLINE)),1); //by FYR } } - if(!strcmp(cws->szSetting,"noOffline")) + if (!strcmp(cws->szSetting,"noOffline")) InvalidateDisplayNameCacheEntryByPDNE((HANDLE)wParam,pdnce,cws->value.type); } - if(!strcmp(cws->szModule,"Protocol")) { - if(!strcmp(cws->szSetting,"p")) { + if (!strcmp(cws->szModule,"Protocol")) { + if (!strcmp(cws->szSetting,"p")) { char *szProto; OutputDebugStringA("CHANGE: proto\r\n"); diff --git a/plugins/Mwclist/clui.c b/plugins/Mwclist/clui.c index fd2838cd08..358da9ef83 100644 --- a/plugins/Mwclist/clui.c +++ b/plugins/Mwclist/clui.c @@ -595,7 +595,7 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l CLUIFramesOnClistResize((WPARAM)hwnd,(LPARAM)0); GetWindowRect(hwnd, &rc); - if(!CallService(MS_CLIST_DOCKINGISDOCKED,0,0)) { + if (!CallService(MS_CLIST_DOCKINGISDOCKED,0,0)) { //if docked, dont remember pos (except for width) DBWriteContactSettingDword(NULL,"CList","Height",(DWORD)(rc.bottom - rc.top)); DBWriteContactSettingDword(NULL,"CList","x",(DWORD)rc.left); @@ -774,7 +774,7 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l } } } } if(hItem) break; - if((hitFlags&(CLCHT_NOWHERE|CLCHT_INLEFTMARGIN|CLCHT_BELOWITEMS))==0) break; + if ((hitFlags&(CLCHT_NOWHERE|CLCHT_INLEFTMARGIN|CLCHT_BELOWITEMS))==0) break; if (DBGetContactSettingByte(NULL,"CLUI","ClientAreaDrag",SETTING_CLIENTDRAG_DEFAULT)) { POINT pt; pt=nm->pt; @@ -785,7 +785,7 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l } } } - else if(((LPNMHDR)lParam)->hwndFrom==pcli->hwndStatus) { + else if (((LPNMHDR)lParam)->hwndFrom==pcli->hwndStatus) { if (((LPNMHDR)lParam)->code == NM_CLICK ) { int nParts=0, nPanel=0; NMMOUSE *nm=(NMMOUSE*)lParam; @@ -935,7 +935,7 @@ int LoadCLUIModule(void) { //int state=DBGetContactSettingByte(NULL,"CList","State",SETTING_STATE_NORMAL); hMenuMain=GetMenu(pcli->hwndContactList); - if(!DBGetContactSettingByte(NULL,"CLUI","ShowMainMenu",SETTING_SHOWMAINMENU_DEFAULT)) SetMenu(pcli->hwndContactList,NULL); + if (!DBGetContactSettingByte(NULL,"CLUI","ShowMainMenu",SETTING_SHOWMAINMENU_DEFAULT)) SetMenu(pcli->hwndContactList,NULL); SetWindowPos(pcli->hwndContactList, DBGetContactSettingByte(NULL,"CList","OnTop",SETTING_ONTOP_DEFAULT) ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); } diff --git a/plugins/Mwclist/cluiopts.c b/plugins/Mwclist/cluiopts.c index 58c0063638..68ff31ca78 100644 --- a/plugins/Mwclist/cluiopts.c +++ b/plugins/Mwclist/cluiopts.c @@ -75,7 +75,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L CheckDlgButton(hwndDlg, IDC_SHOWCAPTION, DBGetContactSettingByte(NULL,"CLUI","ShowCaption",SETTING_SHOWCAPTION_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SHOWMAINMENU, DBGetContactSettingByte(NULL,"CLUI","ShowMainMenu",SETTING_SHOWMAINMENU_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_CLIENTDRAG, DBGetContactSettingByte(NULL,"CLUI","ClientAreaDrag",SETTING_CLIENTDRAG_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - if(!IsDlgButtonChecked(hwndDlg,IDC_SHOWCAPTION)) { + if (!IsDlgButtonChecked(hwndDlg,IDC_SHOWCAPTION)) { EnableWindow(GetDlgItem(hwndDlg,IDC_MIN2TRAY),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_TOOLWND),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_TITLETEXT),FALSE); @@ -93,7 +93,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L EnableWindow(GetDlgItem(hwndDlg,IDC_HIDETIME),IsDlgButtonChecked(hwndDlg,IDC_AUTOHIDE)); EnableWindow(GetDlgItem(hwndDlg,IDC_HIDETIMESPIN),IsDlgButtonChecked(hwndDlg,IDC_AUTOHIDE)); EnableWindow(GetDlgItem(hwndDlg,IDC_STATIC01),IsDlgButtonChecked(hwndDlg,IDC_AUTOHIDE)); - if(!IsDlgButtonChecked(hwndDlg,IDC_AUTOSIZE)) { + if (!IsDlgButtonChecked(hwndDlg,IDC_AUTOSIZE)) { EnableWindow(GetDlgItem(hwndDlg,IDC_STATIC21),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_STATIC22),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_MAXSIZEHEIGHT),FALSE); @@ -125,29 +125,29 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L wsprintfA(szUin,"%u",DBGetContactSettingDword(NULL,"ICQ","UIN",0)); SendDlgItemMessage(hwndDlg,IDC_TITLETEXT,CB_ADDSTRING,0,(LPARAM)szUin); - if(!DBGetContactSettingString(NULL,"ICQ","Nick",&dbv)) { + if (!DBGetContactSettingString(NULL,"ICQ","Nick",&dbv)) { SendDlgItemMessage(hwndDlg,IDC_TITLETEXT,CB_ADDSTRING,0,(LPARAM)dbv.pszVal); mir_free(dbv.pszVal); dbv.pszVal=NULL; } - if(!DBGetContactSettingString(NULL,"ICQ","FirstName",&dbv)) { + if (!DBGetContactSettingString(NULL,"ICQ","FirstName",&dbv)) { SendDlgItemMessage(hwndDlg,IDC_TITLETEXT,CB_ADDSTRING,0,(LPARAM)dbv.pszVal); mir_free(dbv.pszVal); dbv.pszVal=NULL; } - if(!DBGetContactSettingString(NULL,"ICQ","e-mail",&dbv)) { + if (!DBGetContactSettingString(NULL,"ICQ","e-mail",&dbv)) { SendDlgItemMessage(hwndDlg,IDC_TITLETEXT,CB_ADDSTRING,0,(LPARAM)dbv.pszVal); mir_free(dbv.pszVal); dbv.pszVal=NULL; } } - if(!IsWinVer2000Plus()) { + if (!IsWinVer2000Plus()) { EnableWindow(GetDlgItem(hwndDlg,IDC_FADEINOUT),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_TRANSPARENT),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_DROPSHADOW),FALSE); } else CheckDlgButton(hwndDlg,IDC_TRANSPARENT,DBGetContactSettingByte(NULL,"CList","Transparent",SETTING_TRANSPARENT_DEFAULT)?BST_CHECKED:BST_UNCHECKED); - if(!IsDlgButtonChecked(hwndDlg,IDC_TRANSPARENT)) { + if (!IsDlgButtonChecked(hwndDlg,IDC_TRANSPARENT)) { EnableWindow(GetDlgItem(hwndDlg,IDC_STATIC11),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_STATIC12),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_TRANSACTIVE),FALSE); @@ -269,7 +269,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L else SetWindowLong(pcli->hwndContactList,GWL_STYLE,GetWindowLong(pcli->hwndContactList,GWL_STYLE)&~(WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX)); - if(!IsDlgButtonChecked(hwndDlg,IDC_SHOWMAINMENU)) SetMenu(pcli->hwndContactList,NULL); + if (!IsDlgButtonChecked(hwndDlg,IDC_SHOWMAINMENU)) SetMenu(pcli->hwndContactList,NULL); else SetMenu(pcli->hwndContactList,hMenuMain); SetWindowPos(pcli->hwndContactList,0,0,0,0,0,SWP_NOZORDER|SWP_NOMOVE|SWP_NOSIZE|SWP_FRAMECHANGED); @@ -347,7 +347,7 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_SETCOLOUR,0,DBGetContactSettingDword(NULL,"CLUI","SBarBKColor",CLR_DEFAULT)); - if(!IsDlgButtonChecked(hwndDlg,IDC_SHOWSBAR)) { + if (!IsDlgButtonChecked(hwndDlg,IDC_SHOWSBAR)) { EnableWindow(GetDlgItem(hwndDlg,IDC_SHOWICON),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_SHOWPROTO),FALSE); EnableWindow(GetDlgItem(hwndDlg,IDC_SHOWSTATUS),FALSE); diff --git a/plugins/Mwclist/contact.c b/plugins/Mwclist/contact.c index 6e602a6624..578dae5441 100644 --- a/plugins/Mwclist/contact.c +++ b/plugins/Mwclist/contact.c @@ -84,7 +84,7 @@ void LoadContactTree(void) tick=GetTickCount(); CallService(MS_CLUI_LISTBEGINREBUILD,0,0); for(i=1;;i++) { - if((char*)CallService(MS_CLIST_GROUPGETNAME2,i,(LPARAM)(int*)NULL)==NULL) break; + if ((char*)CallService(MS_CLIST_GROUPGETNAME2,i,(LPARAM)(int*)NULL)==NULL) break; CallService(MS_CLUI_GROUPADDED,i,0); } @@ -99,7 +99,7 @@ void LoadContactTree(void) break; } status=cacheEntry->status; - if((!hideOffline || status!=ID_STATUS_OFFLINE) && !cacheEntry->Hidden) + if ((!hideOffline || status!=ID_STATUS_OFFLINE) && !cacheEntry->Hidden) ChangeContactIcon(hContact,ExtIconFromStatusMode(hContact,(char*)cacheEntry->szProto,status),1); hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0); } @@ -137,7 +137,7 @@ int CompareContacts( const struct ClcContact *contact1, const struct ClcContact /* deal with statuses, online contacts have to go above offline */ if (sortNoOfflineBottom==0) - if((statusa==ID_STATUS_OFFLINE)!=(statusb==ID_STATUS_OFFLINE)) { + if ((statusa==ID_STATUS_OFFLINE)!=(statusb==ID_STATUS_OFFLINE)) { return 2*(statusa==ID_STATUS_OFFLINE)-1; } /* both are online, now check protocols */ @@ -156,7 +156,7 @@ int CompareContacts( const struct ClcContact *contact1, const struct ClcContact //one is offline: offline goes below online if (sortNoOfflineBottom==0) { - if((statusa==ID_STATUS_OFFLINE)!=(statusb==ID_STATUS_OFFLINE)) { + if ((statusa==ID_STATUS_OFFLINE)!=(statusb==ID_STATUS_OFFLINE)) { return 2*(statusa==ID_STATUS_OFFLINE)-1; } } @@ -188,7 +188,7 @@ void SortContacts(void) INT_PTR ContactChangeGroup(WPARAM wParam,LPARAM lParam) { CallService(MS_CLUI_CONTACTDELETED,wParam,0); - if((HANDLE)lParam==NULL) + if ((HANDLE)lParam==NULL) DBDeleteContactSetting((HANDLE)wParam,"CList","Group"); else DBWriteContactSettingString((HANDLE)wParam,"CList","Group",(char*)CallService(MS_CLIST_GROUPGETNAME2,lParam,(LPARAM)(int*)NULL)); diff --git a/plugins/Mwclist/init.c b/plugins/Mwclist/init.c index 6d5810c561..25eb944257 100644 --- a/plugins/Mwclist/init.c +++ b/plugins/Mwclist/init.c @@ -129,7 +129,7 @@ static int systemModulesLoaded(WPARAM wParam, LPARAM lParam) __try { int *disableDefaultModule = 0; disableDefaultModule=(int*)CallService(MS_PLUGINS_GETDISABLEDEFAULTARRAY,0,0); - if(!disableDefaultModule[DEFMOD_UICLUI]) if( LoadCLUIModule()) return 1; + if (!disableDefaultModule[DEFMOD_UICLUI]) if ( LoadCLUIModule()) return 1; } __except (exceptFunction(GetExceptionInformation()) ) { -- cgit v1.2.3