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/Scriver/chat/clist.c | 2 +- plugins/Scriver/chat/colorchooser.c | 2 +- plugins/Scriver/chat/options.c | 18 +++++++++--------- plugins/Scriver/chat/tools.c | 2 +- plugins/Scriver/msglog.c | 2 +- plugins/Scriver/msgwindow.c | 2 +- plugins/Scriver/richutil.c | 2 +- plugins/Scriver/statusicon.c | 10 +++++----- 8 files changed, 20 insertions(+), 20 deletions(-) (limited to 'plugins/Scriver') diff --git a/plugins/Scriver/chat/clist.c b/plugins/Scriver/chat/clist.c index 7d43578a4b..03a88ede7f 100644 --- a/plugins/Scriver/chat/clist.c +++ b/plugins/Scriver/chat/clist.c @@ -297,7 +297,7 @@ BOOL CList_AddEvent(HANDLE hContact, HICON Icon, HANDLE event, int type, TCHAR* cle.pszService= "GChat/DblClickEvent" ; cle.ptszTooltip = TranslateTS(szBuf); if ( type ) { - if(!CallService(MS_CLIST_GETEVENT, (WPARAM)hContact, (LPARAM)0)) + if (!CallService(MS_CLIST_GETEVENT, (WPARAM)hContact, (LPARAM)0)) CallService(MS_CLIST_ADDEVENT,(WPARAM) hContact,(LPARAM) &cle); } else { if(CallService(MS_CLIST_GETEVENT, (WPARAM)hContact, (LPARAM)0)) diff --git a/plugins/Scriver/chat/colorchooser.c b/plugins/Scriver/chat/colorchooser.c index eb330bfe89..3ccec763f9 100644 --- a/plugins/Scriver/chat/colorchooser.c +++ b/plugins/Scriver/chat/colorchooser.c @@ -108,7 +108,7 @@ INT_PTR CALLBACK DlgProcColorToolWindow(HWND hwndDlg, UINT msg, WPARAM wParam, L case WM_CTLCOLOREDIT: case WM_CTLCOLORSTATIC: - if((HWND)lParam==GetDlgItem(hwndDlg,IDC_CHAT_COLORTEXT)) { + if ((HWND)lParam==GetDlgItem(hwndDlg,IDC_CHAT_COLORTEXT)) { SetTextColor((HDC)wParam,RGB(60,60,150)); SetBkColor((HDC)wParam,GetSysColor(COLOR_WINDOW)); return (INT_PTR)GetSysColorBrush(COLOR_WINDOW); diff --git a/plugins/Scriver/chat/options.c b/plugins/Scriver/chat/options.c index bf768be19e..5f74dc6417 100644 --- a/plugins/Scriver/chat/options.c +++ b/plugins/Scriver/chat/options.c @@ -184,7 +184,7 @@ static void CheckHeading(HWND hwndTree, HTREEITEM hHeading) if(tvi.hItem != branch1[0].hItem && tvi.hItem != branch1[1].hItem ) { TreeView_GetItem(hwndTree,&tvi); - if(((tvi.state&TVIS_STATEIMAGEMASK)>>12==1)) + if (((tvi.state&TVIS_STATEIMAGEMASK)>>12==1)) bChecked = FALSE; } tvi.hItem=TreeView_GetNextSibling(hwndTree,tvi.hItem); @@ -205,7 +205,7 @@ static void CheckBranches(HWND hwndTree, HTREEITEM hHeading) tvi.mask=TVIF_HANDLE|TVIF_STATE; tvi.hItem = hHeading; TreeView_GetItem(hwndTree,&tvi); - if(((tvi.state&TVIS_STATEIMAGEMASK)>>12==2)) + if (((tvi.state&TVIS_STATEIMAGEMASK)>>12==2)) bChecked = FALSE; tvi.hItem=TreeView_GetNextItem(hwndTree, hHeading, TVGN_CHILD); tvi.stateMask = TVIS_STATEIMAGEMASK; @@ -235,7 +235,7 @@ static INT CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lp, LPARAM p void LoadLogFonts(void) { int i; - for( i = 0; iidFrom) { case IDC_CHAT_CHECKBOXES: - 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()); @@ -458,7 +458,7 @@ BOOL CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam CheckHeading(GetDlgItem(hwndDlg, IDC_CHAT_CHECKBOXES), hListHeading3); break; case WM_COMMAND: - if( (LOWORD(wParam) == IDC_CHAT_INSTAMP + if ( (LOWORD(wParam) == IDC_CHAT_INSTAMP || LOWORD(wParam) == IDC_CHAT_OUTSTAMP || LOWORD(wParam) == IDC_CHAT_TIMESTAMP || LOWORD(wParam) == IDC_CHAT_LOGLIMIT @@ -591,7 +591,7 @@ BOOL CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam else DBDeleteContactSetting(NULL, "Chat", "LogTimestamp"); iLen = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_CHAT_TIMESTAMP)); - if( iLen > 0 ) { + if ( iLen > 0 ) { pszText = mir_realloc(pszText, iLen+1); GetDlgItemTextA(hwndDlg, IDC_CHAT_TIMESTAMP, pszText,iLen+1); DBWriteContactSettingString(NULL, "Chat", "HeaderTime", pszText); @@ -607,7 +607,7 @@ BOOL CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam else DBDeleteContactSetting(NULL, "Chat", "HeaderIncoming"); iLen = GetWindowTextLength(GetDlgItem(hwndDlg, IDC_CHAT_OUTSTAMP)); - if( iLen > 0 ) { + if ( iLen > 0 ) { pszText = mir_realloc(pszText, iLen+1); GetDlgItemTextA(hwndDlg, IDC_CHAT_OUTSTAMP, pszText,iLen+1); DBWriteContactSettingString(NULL, "Chat", "HeaderOutgoing", pszText); @@ -694,7 +694,7 @@ static INT_PTR CALLBACK DlgProcOptionsPopup(HWND hwndDlg,UINT uMsg,WPARAM wParam }break; case WM_COMMAND: - if( (LOWORD(wParam) == IDC_CHAT_TIMEOUT) + if ( (LOWORD(wParam) == IDC_CHAT_TIMEOUT) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus())) return 0; if(lParam != (LPARAM)NULL) @@ -718,7 +718,7 @@ static INT_PTR CALLBACK DlgProcOptionsPopup(HWND hwndDlg,UINT uMsg,WPARAM wParam switch(((LPNMHDR)lParam)->idFrom) { case IDC_CHAT_CHECKBOXES: - 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()); diff --git a/plugins/Scriver/chat/tools.c b/plugins/Scriver/chat/tools.c index 2dd4bedf3f..edf1fb11e4 100644 --- a/plugins/Scriver/chat/tools.c +++ b/plugins/Scriver/chat/tools.c @@ -920,7 +920,7 @@ TCHAR* GetChatLogsFilename (HANDLE hContact, time_t tTime) if (g_Settings.pszLogDir[_tcslen(g_Settings.pszLogDir)-1] == '\\') _tcscat(g_Settings.pszLogDir, _T("%userid%.log")); - if(!tTime) + if (!tTime) time(&tTime); // day 1-31 diff --git a/plugins/Scriver/msglog.c b/plugins/Scriver/msglog.c index 044fc8716a..4316b82171 100644 --- a/plugins/Scriver/msglog.c +++ b/plugins/Scriver/msglog.c @@ -104,7 +104,7 @@ TCHAR *GetNickname(HANDLE hContact, const char* szProto) { if (ci.pszVal) { #if defined ( _UNICODE ) if(IsUnicodeMIM()) { - if(!_tcscmp((TCHAR *)ci.pszVal, TranslateW(_T("'(Unknown Contact)'")))) { + if (!_tcscmp((TCHAR *)ci.pszVal, TranslateW(_T("'(Unknown Contact)'")))) { ci.dwFlag &= ~CNF_UNICODE; if (!CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM) & ci)) { szName = a2t((char *)ci.pszVal); diff --git a/plugins/Scriver/msgwindow.c b/plugins/Scriver/msgwindow.c index fbd82472f8..7af68a2c5e 100644 --- a/plugins/Scriver/msgwindow.c +++ b/plugins/Scriver/msgwindow.c @@ -994,7 +994,7 @@ INT_PTR CALLBACK DlgProcParentWindow(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR } return TRUE; case CM_ACTIVATECHILD: -// if((HWND) lParam != dat->hwndActive) { +// if ((HWND) lParam != dat->hwndActive) { ActivateChild(dat, (HWND) lParam); // } return TRUE; diff --git a/plugins/Scriver/richutil.c b/plugins/Scriver/richutil.c index d7c653b8db..52dff7505f 100644 --- a/plugins/Scriver/richutil.c +++ b/plugins/Scriver/richutil.c @@ -237,7 +237,7 @@ static LRESULT CALLBACK RichUtil_Proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM if (IsWindow(hwnd)) { - if((WNDPROC)GetWindowLongPtr(hwnd, GWLP_WNDPROC) == &RichUtil_Proc) + if ((WNDPROC)GetWindowLongPtr(hwnd, GWLP_WNDPROC) == &RichUtil_Proc) SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)ru->origProc); } diff --git a/plugins/Scriver/statusicon.c b/plugins/Scriver/statusicon.c index 0343c0c298..2b77d099c8 100644 --- a/plugins/Scriver/statusicon.c +++ b/plugins/Scriver/statusicon.c @@ -136,7 +136,7 @@ INT_PTR ModifyStatusIcon(WPARAM wParam, LPARAM lParam) { while(current) { if(strcmp(current->sid.szModule, sid->szModule) == 0 && current->sid.dwId == sid->dwId) { - if(!hContact) { + if (!hContact) { current->sid.flags = sid->flags; if(sid->hIcon) { ReleaseIconSmart(current->sid.hIcon); @@ -183,8 +183,8 @@ void DrawStatusIcons(HANDLE hContact, HDC hDC, RECT r, int gap) { while(current) { sprintf(buff, "SRMMStatusIconFlags%d", (int)current->sid.dwId); flags = DBGetContactSettingByte(hContact, current->sid.szModule, buff, current->sid.flags); - if(!(flags & MBF_HIDDEN)) { - if((flags & MBF_DISABLED) && current->sid.hIconDisabled) hIcon = current->sid.hIconDisabled; + if (!(flags & MBF_HIDDEN)) { + if ((flags & MBF_DISABLED) && current->sid.hIconDisabled) hIcon = current->sid.hIconDisabled; else hIcon = current->sid.hIcon; SetBkMode(hDC, TRANSPARENT); @@ -206,7 +206,7 @@ void CheckStatusIconClick(HANDLE hContact, HWND hwndFrom, POINT pt, RECT r, int while(current) { sprintf(buff, "SRMMStatusIconFlags%d", (int)current->sid.dwId); flags = DBGetContactSettingByte(hContact, current->sid.szModule, buff, current->sid.flags); - if(!(flags & MBF_HIDDEN)) iconNum--; + if (!(flags & MBF_HIDDEN)) iconNum--; if (iconNum == 0) break; current = current->next; } @@ -248,7 +248,7 @@ INT_PTR GetStatusIconsCount(HANDLE hContact) { while(current) { sprintf(buff, "SRMMStatusIconFlags%d", (int)current->sid.dwId); flags = DBGetContactSettingByte(hContact, current->sid.szModule, buff, current->sid.flags); - if(!(flags & MBF_HIDDEN)) { + if (!(flags & MBF_HIDDEN)) { count ++; } current = current->next; -- cgit v1.2.3