From 39390b02dbd5aa7eb21a83773fa561b39f8828bc Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 16 Mar 2018 20:01:14 +0300
Subject: always hated these long expressions: contact_iter makes them much
 shorter

---
 plugins/Clist_nicer/src/contact.cpp   | 4 ++--
 plugins/Clist_nicer/src/extBackg.cpp  | 2 +-
 plugins/Clist_nicer/src/viewmodes.cpp | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/Clist_nicer')

diff --git a/plugins/Clist_nicer/src/contact.cpp b/plugins/Clist_nicer/src/contact.cpp
index facb3a48a6..f62749c3eb 100644
--- a/plugins/Clist_nicer/src/contact.cpp
+++ b/plugins/Clist_nicer/src/contact.cpp
@@ -113,7 +113,7 @@ void MF_UpdateThread(LPVOID)
 	ResetEvent(hEvent);
 
 	while (mf_updatethread_running) {
-		for (MCONTACT hContact = db_find_first(); hContact && mf_updatethread_running; hContact = db_find_next(hContact)) {
+		for (auto &hContact : contact_iter()) {
 			MF_CalcFrequency(hContact, 50, 1);
 			if (mf_updatethread_running)
 				WaitForSingleObject(hEvent, 5000);
@@ -130,7 +130,7 @@ void MF_InitCheck(void)
 {
 	BYTE bMsgFrequency = db_get_b(NULL, "CList", "fhistdata", 0);
 	if (!bMsgFrequency) {
-		for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))
+		for (auto &hContact : contact_iter())
 			MF_CalcFrequency(hContact, 100, 0);
 		db_set_b(NULL, "CList", "fhistdata", 1);
 	}
diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp
index 8a6229c1ba..815a4e3e95 100644
--- a/plugins/Clist_nicer/src/extBackg.cpp
+++ b/plugins/Clist_nicer/src/extBackg.cpp
@@ -1281,7 +1281,7 @@ void LoadPerContactSkins(wchar_t *tszFileName)
 	}
 
 	if (items) {
-		for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+		for (auto &hContact : contact_iter()) {
 			char *szProto = GetContactProto(hContact);
 			if (szProto == nullptr)
 				continue;
diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp
index 61c058a65d..01c19789a5 100644
--- a/plugins/Clist_nicer/src/viewmodes.cpp
+++ b/plugins/Clist_nicer/src/viewmodes.cpp
@@ -134,7 +134,7 @@ static DWORD GetMaskForItem(HANDLE hItem)
 
 static void UpdateStickies()
 {
-	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+	for (auto &hContact : contact_iter()) {
 		MCONTACT hItem = (MCONTACT)SendDlgItemMessage(sttClvmHwnd, IDC_CLIST, CLM_FINDCONTACT, hContact, 0);
 		if (hItem)
 			SendDlgItemMessage(sttClvmHwnd, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItem, db_get_b(hContact, "CLVM", sttModeName, 0) ? 1 : 0);
@@ -374,7 +374,7 @@ void SaveState()
 			DWORD dwGlobalMask = GetMaskForItem(hInfoItem);
 
 			unsigned int stickies = 0;
-			for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+			for (auto &hContact : contact_iter()) {
 				HANDLE hItem = (HANDLE)SendDlgItemMessage(sttClvmHwnd, IDC_CLIST, CLM_FINDCONTACT, hContact, 0);
 				if (hItem) {
 					if (SendDlgItemMessage(sttClvmHwnd, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0)) {
@@ -652,7 +652,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 							Clist_Broadcast(CLM_AUTOREBUILD, 0, 0);
 							SetWindowText(hwndSelector, TranslateT("No view mode"));
 						}
-						for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))
+						for (auto &hContact : contact_iter())
 							if (db_get_dw(hContact, "CLVM", szBuf, -1) != -1)
 								db_set_dw(hContact, "CLVM", szBuf, 0);
 
@@ -695,7 +695,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			break;
 
 		case IDC_CLEARALL:
-			for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+			for (auto &hContact : contact_iter()) {
 				HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, hContact, 0);
 				if (hItem)
 					SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItem, 0);
-- 
cgit v1.2.3