From d154673f93ad95197bce8cadb995daa5bc39f5d8 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 21 Jan 2014 20:04:48 +0000 Subject: minor code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@7820 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/findadd/findadd.cpp | 14 +++++++------- src/modules/findadd/searchresults.cpp | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/modules/findadd') diff --git a/src/modules/findadd/findadd.cpp b/src/modules/findadd/findadd.cpp index 56cb499dca..bf91362ce0 100644 --- a/src/modules/findadd/findadd.cpp +++ b/src/modules/findadd/findadd.cpp @@ -358,14 +358,14 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP TCHAR *szProto = NULL; DBVARIANT dbv; - if ( !db_get_ts(NULL, "FindAdd", "LastSearched", &dbv)){ + if (!db_get_ts(NULL, "FindAdd", "LastSearched", &dbv)){ szProto = NEWTSTR_ALLOCA(dbv.ptszVal); db_free(&dbv); /* free string szProto was fetched with */ } int i, index = 0, cbwidth = 0, netProtoCount = 0; for (i=0; i < accounts.getCount(); i++) { - if ( !Proto_IsAccountEnabled(accounts[i])) + if (!Proto_IsAccountEnabled(accounts[i])) continue; DWORD caps = (DWORD)CallProtoServiceInt(NULL,accounts[i]->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0); @@ -393,11 +393,11 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP for (i=0; i < accounts.getCount(); i++) { PROTOACCOUNT* pa = accounts[i]; - if ( !Proto_IsAccountEnabled(pa)) + if (!Proto_IsAccountEnabled(pa)) continue; DWORD caps = (DWORD)CallProtoServiceInt(NULL,pa->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0); - if ( !(caps&PF1_BASICSEARCH) && !(caps&PF1_EXTSEARCH) && !(caps&PF1_SEARCHBYEMAIL) && !(caps&PF1_SEARCHBYNAME)) + if (!(caps&PF1_BASICSEARCH) && !(caps&PF1_EXTSEARCH) && !(caps&PF1_SEARCHBYEMAIL) && !(caps&PF1_SEARCHBYNAME)) continue; cbei.pszText = pa->tszAccountName; @@ -536,7 +536,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP (dat->showTiny && IsDlgButtonChecked(hwndDlg, IDC_BYCUSTOM)) || (dat->showName && IsDlgButtonChecked(hwndDlg, IDC_BYNAME)) || (dat->showProtoId && IsDlgButtonChecked(hwndDlg, IDC_BYPROTOID)); - if ( !checkmarkVisible) { + if (!checkmarkVisible) { if (dat->showProtoId) CheckSearchTypeRadioButton(hwndDlg, IDC_BYPROTOID); else if (dat->showEmail) CheckSearchTypeRadioButton(hwndDlg, IDC_BYEMAIL); else if (dat->showName) CheckSearchTypeRadioButton(hwndDlg, IDC_BYNAME); @@ -875,7 +875,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP bool isUnicode = (psr->flags & PSR_UNICODE) != 0; if (psr->id) { BOOL validPtr = isUnicode ? IsBadStringPtrW((wchar_t*)psr->id, 25) : IsBadStringPtrA((char*)psr->id, 25); - if ( !validPtr) { + if (!validPtr) { isUnicode = false; lsr->psr.id = NULL; } @@ -1006,7 +1006,7 @@ static INT_PTR FindAddCommand(WPARAM, LPARAM) // that is not good either... for (int i=0; i < accounts.getCount(); i++) { PROTOACCOUNT* pa = accounts[i]; - if ( !Proto_IsAccountEnabled(pa)) + if (!Proto_IsAccountEnabled(pa)) continue; int protoCaps = CallProtoServiceInt(NULL,pa->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0); diff --git a/src/modules/findadd/searchresults.cpp b/src/modules/findadd/searchresults.cpp index 9bf94d3713..57dcb2bc4f 100644 --- a/src/modules/findadd/searchresults.cpp +++ b/src/modules/findadd/searchresults.cpp @@ -138,7 +138,7 @@ int CALLBACK SearchResultsCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lPa sortMultiplier = dat->bSortAscending?1:-1; sortCol = dat->iLastColumnSortIndex; - if ( !dat->bFlexSearchResult) + if (!dat->bFlexSearchResult) { lsr1 = (struct ListSearchResult*)ListView_GetItemLParam(hList, (int)lParam1); lsr2 = (struct ListSearchResult*)ListView_GetItemLParam(hList, (int)lParam2); @@ -214,9 +214,9 @@ int BeginSearch(HWND, struct FindAddDlgData *dat, const char *szProto, const cha dat->search = (struct ProtoSearchInfo*)mir_calloc(sizeof(struct ProtoSearchInfo) * accounts.getCount()); for (int i=0; i < accounts.getCount();i++) { PROTOACCOUNT* pa = accounts[i]; - if ( !Proto_IsAccountEnabled(pa)) continue; + if (!Proto_IsAccountEnabled(pa)) continue; DWORD caps = (DWORD)CallProtoServiceInt(NULL,pa->szModuleName, PS_GETCAPS, PFLAGNUM_1, 0); - if ( !(caps&requiredCapability)) continue; + if (!(caps&requiredCapability)) continue; dat->search[dat->searchCount].hProcess = (HANDLE)CallProtoServiceInt(NULL,pa->szModuleName, szSearchService, 0, (LPARAM)pvSearchParams); dat->search[dat->searchCount].szProto = pa->szModuleName; if (dat->search[dat->searchCount].hProcess == NULL) failures++; @@ -261,7 +261,7 @@ void SetStatusBarSearchInfo(HWND hwndStatus, struct FindAddDlgData *dat) lstrcpy(str, TranslateT("Searching")); for (i=0; i < dat->searchCount; i++) { PROTOACCOUNT* pa = Proto_GetAccount(dat->search[i].szProto); - if ( !pa) + if (!pa) continue; lstrcat(str, i ? _T(", ") : _T(" ")); -- cgit v1.2.3