From 8d80538230c30daa2d8742e19421c49e90fdb13d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 18 May 2016 12:03:46 +0000 Subject: code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@16847 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/modern_clc.cpp | 18 +++++++++--------- plugins/Clist_modern/src/modern_clc.h | 2 +- plugins/Clist_modern/src/modern_clcidents.cpp | 4 ++-- plugins/Clist_modern/src/modern_clcitems.cpp | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index dcc8a50adc..36462ff35a 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -546,7 +546,7 @@ static LRESULT clcOnKeyDown(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM if (ht) { ClcContact *contact2; ClcGroup *group2; - if (FindItem(hwnd, dat, contact->hContact, &contact2, &group2, NULL, FALSE)) { + if (FindItem(hwnd, dat, contact->hContact, &contact2, &group2, NULL, false)) { int i = cliGetRowsPriorTo(&dat->list, group2, GetContactIndex(group2, contact2)); pcli->pfnEnsureVisible(hwnd, dat, i + contact->SubAllocated, 0); } @@ -642,7 +642,7 @@ static LRESULT clcOnTimer(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPAR int i = 0; ClcContact *contact; ClcGroup *group; - if (FindItem(hwnd, dat, hitcontact->hContact, &contact, &group, NULL, FALSE)) { + if (FindItem(hwnd, dat, hitcontact->hContact, &contact, &group, NULL, false)) { i = cliGetRowsPriorTo(&dat->list, group, GetContactIndex(group, contact)); pcli->pfnEnsureVisible(hwnd, dat, i + hitcontact->SubAllocated, 0); } @@ -1437,7 +1437,7 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam static LRESULT clcOnIntmAvatarChanged(ClcData *dat, HWND hwnd, UINT, WPARAM hContact, LPARAM) { ClcContact *contact; - if (FindItem(hwnd, dat, hContact, &contact, NULL, NULL, FALSE)) + if (FindItem(hwnd, dat, hContact, &contact, NULL, NULL, false)) Cache_GetAvatar(dat, contact); else if (hContact == 0) UpdateAllAvatars(dat); @@ -1449,7 +1449,7 @@ static LRESULT clcOnIntmAvatarChanged(ClcData *dat, HWND hwnd, UINT, WPARAM hCon static LRESULT clcOnIntmTimeZoneChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { ClcContact *contact; - if (!FindItem(hwnd, dat, wParam, &contact, NULL, NULL, FALSE)) + if (!FindItem(hwnd, dat, wParam, &contact, NULL, NULL, false)) return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); if (contact) { @@ -1467,7 +1467,7 @@ static LRESULT clcOnIntmNameChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM wP pcli->pfnInvalidateDisplayNameCacheEntry(wParam); ClcContact *contact; - if (!FindItem(hwnd, dat, wParam, &contact, NULL, NULL, FALSE)) + if (!FindItem(hwnd, dat, wParam, &contact, NULL, NULL, false)) return ret; if (contact) { @@ -1491,7 +1491,7 @@ static LRESULT clcOnIntmStatusMsgChanged(ClcData *dat, HWND hwnd, UINT msg, WPAR return corecli.pfnContactListControlWndProc(hwnd, msg, hContact, lParam); ClcContact *contact; - if (!FindItem(hwnd, dat, hContact, &contact, NULL, NULL, FALSE)) + if (!FindItem(hwnd, dat, hContact, &contact, NULL, NULL, false)) return corecli.pfnContactListControlWndProc(hwnd, msg, hContact, lParam); if (contact) { @@ -1507,7 +1507,7 @@ static LRESULT clcOnIntmNotOnListChanged(ClcData *dat, HWND hwnd, UINT msg, WPAR DBCONTACTWRITESETTING *dbcws = (DBCONTACTWRITESETTING*)lParam; ClcContact *contact; - if (!FindItem(hwnd, dat, wParam, &contact, NULL, NULL, TRUE)) + if (!FindItem(hwnd, dat, wParam, &contact, NULL, NULL, true)) return corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam); if (contact->type != CLCIT_CONTACT) @@ -1539,7 +1539,7 @@ static LRESULT clcOnIntmStatusChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM if (wParam != 0) { ClcContact *contact; - if (FindItem(hwnd, dat, wParam, &contact, NULL, NULL, TRUE)) { + if (FindItem(hwnd, dat, wParam, &contact, NULL, NULL, true)) { ClcCacheEntry *pdnce = contact->pce; if (pdnce && pdnce->m_pszProto) { if (!dat->force_in_dialog) { @@ -1549,7 +1549,7 @@ static LRESULT clcOnIntmStatusChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM SendMessage(hwnd, INTM_ICONCHANGED, wParam, corecli.pfnGetContactIcon(wParam)); - if (contact && contact->type == CLCIT_CONTACT) { + if (contact->type == CLCIT_CONTACT) { if (!contact->image_is_special && pdnce->getStatus() > ID_STATUS_OFFLINE) contact->iImage = corecli.pfnGetContactIcon(wParam); if (contact->isSubcontact && contact->subcontacts && contact->subcontacts->type == CLCIT_CONTACT) diff --git a/plugins/Clist_modern/src/modern_clc.h b/plugins/Clist_modern/src/modern_clc.h index f180bd53d9..f4321024cc 100644 --- a/plugins/Clist_modern/src/modern_clc.h +++ b/plugins/Clist_modern/src/modern_clc.h @@ -349,7 +349,7 @@ void ClcOptionsChanged(void); //clcidents.c int cliGetRowsPriorTo(ClcGroup *group, ClcGroup *subgroup, int contactIndex); -int FindItem(HWND hwnd, ClcData *dat, DWORD hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible, BOOL isIgnoreSubcontacts); +int FindItem(HWND hwnd, ClcData *dat, DWORD hItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible, bool isIgnoreSubcontacts); int cliGetRowByIndex(ClcData *dat, int testindex, ClcContact **contact, ClcGroup **subgroup); //clcitems.c diff --git a/plugins/Clist_modern/src/modern_clcidents.cpp b/plugins/Clist_modern/src/modern_clcidents.cpp index 12712894bd..2f10f3306f 100644 --- a/plugins/Clist_modern/src/modern_clcidents.cpp +++ b/plugins/Clist_modern/src/modern_clcidents.cpp @@ -79,10 +79,10 @@ int cliGetRowsPriorTo(ClcGroup *group, ClcGroup *subgroup, int contactIndex) int cliFindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible) { - return FindItem(hwnd, dat, dwItem, contact, subgroup, isVisible, FALSE); + return FindItem(hwnd, dat, dwItem, contact, subgroup, isVisible, false); } -int FindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible, BOOL isIgnoreSubcontacts) +int FindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible, bool isIgnoreSubcontacts) { int index = 0; int nowVisible = 1; diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp index eee821e4d1..7bf3c4aff2 100644 --- a/plugins/Clist_modern/src/modern_clcitems.cpp +++ b/plugins/Clist_modern/src/modern_clcitems.cpp @@ -197,7 +197,7 @@ void cli_AddContactToTree(HWND hwnd, ClcData *dat, MCONTACT hContact, int update ClcGroup *group; ClcContact *cont; - if (FindItem(hwnd, dat, hContact, &cont, &group, NULL, FALSE)) + if (FindItem(hwnd, dat, hContact, &cont, &group, NULL, false)) _LoadDataToContact(cont, group, dat, hContact); } -- cgit v1.2.3