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/SMS/src/SMS_svc.cpp   | 2 +-
 plugins/SMS/src/functions.cpp | 2 +-
 plugins/SMS/src/senddlg.cpp   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins/SMS')

diff --git a/plugins/SMS/src/SMS_svc.cpp b/plugins/SMS/src/SMS_svc.cpp
index 1f62781b2f..99e3059127 100644
--- a/plugins/SMS/src/SMS_svc.cpp
+++ b/plugins/SMS/src/SMS_svc.cpp
@@ -77,7 +77,7 @@ int SendSMSMenuCommand(WPARAM wParam, LPARAM)
 		EnableWindow(GetDlgItem(hwndSendSms, IDC_NAME), TRUE);
 		EnableWindow(GetDlgItem(hwndSendSms, IDC_SAVENUMBER), FALSE);
 
-		for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+		for (auto &hContact : contact_iter()) {
 			if (GetContactPhonesCount(hContact)) {
 				SendDlgItemMessage(hwndSendSms, IDC_NAME, CB_ADDSTRING, 0, (LPARAM)pcli->pfnGetContactDisplayName(hContact, 0));
 				SendSMSWindowSMSContactAdd(hwndSendSms, hContact);
diff --git a/plugins/SMS/src/functions.cpp b/plugins/SMS/src/functions.cpp
index 3f125ac24e..0adc6aee21 100644
--- a/plugins/SMS/src/functions.cpp
+++ b/plugins/SMS/src/functions.cpp
@@ -183,7 +183,7 @@ MCONTACT HContactFromPhone(LPWSTR lpwszPhone, size_t dwPhoneSize)
 {
 	if (lpwszPhone && dwPhoneSize) {
 		//check not already on list
-		for (MCONTACT hContact = db_find_first(); hContact != NULL; hContact = db_find_next(hContact))
+		for (auto &hContact : contact_iter())
 			if (IsContactPhone(hContact, lpwszPhone, dwPhoneSize))
 				return hContact;
 	}
diff --git a/plugins/SMS/src/senddlg.cpp b/plugins/SMS/src/senddlg.cpp
index 40bd163a53..ed13941203 100644
--- a/plugins/SMS/src/senddlg.cpp
+++ b/plugins/SMS/src/senddlg.cpp
@@ -1051,7 +1051,7 @@ void SendSMSWindowFillTreeView(HWND hWnd)
 	HWND hWndTreeView = GetDlgItem(hWnd, IDC_NUMBERSLIST);
 	TreeView_DeleteAllItems(hWndTreeView);
 
-	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+	for (auto &hContact : contact_iter()) {
 		HTREEITEM hParent = nullptr;
 		LPSTR lpszProto = GetContactProto(hContact);
 		if (lpszProto) {
-- 
cgit v1.2.3