always hated these long expressions: contact_iter makes them much shorter

4 files changed, 9 insertions, 16 deletions

diff --git a/plugins/NewAwaySysMod/src/AwayOpt.cpp b/plugins/NewAwaySysMod/src/AwayOpt.cpp
index 0b413d290e..16e8b4d3ba 100644
--- a/plugins/NewAwaySysMod/src/AwayOpt.cpp
+++ b/plugins/NewAwaySysMod/src/AwayOpt.cpp
@@ -853,8 +853,7 @@ static void SetAllContactIcons(HWND hwndList, HANDLE hItemUnknown)
 	SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItemUnknown, MAKELPARAM(IGNORECOLUMN, DBValueToIgnoreIcon(CContactSettings(ID_STATUS_ONLINE, INVALID_CONTACT_ID).Ignore)));

 	SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItemUnknown, MAKELPARAM(AUTOREPLYCOLUMN, DBValueToOptReplyIcon(CContactSettings(ID_STATUS_ONLINE, INVALID_CONTACT_ID).Autoreply)));

 

-	MCONTACT hContact = db_find_first();

-	do {

+	for (auto &hContact : contact_iter()) {

 		HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, hContact, 0);

 		if (hItem) {

 			int Ignore = CContactSettings(ID_STATUS_ONLINE, hContact).Ignore;

@@ -873,7 +872,6 @@ static void SetAllContactIcons(HWND hwndList, HANDLE hItemUnknown)
 			SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(AUTOREPLYCOLUMN, DBValueToOptReplyIcon(Reply)));

 		}

 	}

-		while (hContact = db_find_next(hContact));

 }

 

 static LRESULT CALLBACK ContactsSubclassProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)

@@ -922,8 +920,8 @@ INT_PTR CALLBACK ContactsOptDlg(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam)
 			hItemAll = (HANDLE)SendMessage(hwndList, CLM_ADDINFOITEM, 0, (LPARAM)&cii);

 			cii.pszText = TranslateT("** Not-on-list contacts **"); // == Unknown contacts

 			hItemUnknown = (HANDLE)SendMessage(hwndList, CLM_ADDINFOITEM, 0, (LPARAM)&cii);

-			MCONTACT hContact = db_find_first();

-			do {

+

+			for (auto &hContact : contact_iter()) {

 				char *szProto = GetContactProto(hContact);

 				if (szProto) {

 					int Flag1 = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0);

@@ -931,7 +929,7 @@ INT_PTR CALLBACK ContactsOptDlg(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam)
 						SendMessage(hwndList, CLM_DELETEITEM, SendMessage(hwndList, CLM_FINDCONTACT, hContact, 0), 0);

 				}

 			}

-				while (hContact = db_find_next(hContact));

+

 			SetAllContactIcons(hwndList, hItemUnknown);

 			SetListGroupIcons(hwndList, (HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_ROOT, 0), hItemAll);

 			g_OrigContactsProc = (WNDPROC)SetWindowLongPtr(hwndList, GWLP_WNDPROC, (LONG_PTR)ContactsSubclassProc);

@@ -997,7 +995,7 @@ INT_PTR CALLBACK ContactsOptDlg(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam)
 		case 0:

 			switch (((LPNMHDR)lParam)->code) {

 			case PSN_APPLY:

-				for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+				for (auto &hContact : contact_iter()) {

 					HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, hContact, 0);

 					if (hItem)

 						SaveItemState(hwndList, hContact, hItem);

diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp
index fd339acc69..37f378319d 100644
--- a/plugins/NewAwaySysMod/src/AwaySys.cpp
+++ b/plugins/NewAwaySysMod/src/AwaySys.cpp
@@ -133,7 +133,7 @@ int StatusMsgReq(WPARAM wParam, LPARAM lParam, CString &szProto)
 	// find the contact

 	char *szFoundProto;

 	MCONTACT hFoundContact = NULL; // if we'll find the contact only on some other protocol, but not on szProto, then we'll use that hContact.

-	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+	for (auto &hContact : contact_iter()) {

 		char *szCurProto = GetContactProto(hContact);

 		if (db_get_dw(hContact, szCurProto, "UIN", 0) == lParam) {

 			szFoundProto = szCurProto;

diff --git a/plugins/NewAwaySysMod/src/Properties.cpp b/plugins/NewAwaySysMod/src/Properties.cpp
index 7fc0fa32a5..64b6ac0f83 100644
--- a/plugins/NewAwaySysMod/src/Properties.cpp
+++ b/plugins/NewAwaySysMod/src/Properties.cpp
@@ -34,16 +34,13 @@ void ResetSettingsOnStatusChange(const char *szProto = nullptr, int bResetPerson
 	if (bResetPersonalMsgs)

 		bResetPersonalMsgs = !g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_SAVEPERSONALMSGS);

 

-	MCONTACT hContact = db_find_first();

-	while (hContact) {

+	for (auto &hContact : contact_iter()) {

 		const char *szCurProto;

 		if (!szProto || ((szCurProto = GetContactProto(hContact)) && !mir_strcmp(szProto, szCurProto))) {

 			ResetContactSettingsOnStatusChange(hContact);

-			if (bResetPersonalMsgs) {

+			if (bResetPersonalMsgs)

 				CContactSettings(Status, hContact).SetMsgFormat(SMF_PERSONAL, nullptr); // TODO: delete only when SAM dialog opens?

-			}

 		}

-		hContact = db_find_next(hContact);

 	}

 }

 

diff --git a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
index 26fb5a2db7..e953b125c3 100644
--- a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
+++ b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
@@ -878,9 +878,8 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 				}

 			}

 

-			MCONTACT hContact = db_find_first();

 			CList->SetRedraw(false);

-			do {

+			for (auto &hContact : contact_iter()) {

 				char *szProto = GetContactProto(hContact);

 				if (szProto) {

 					int Flag1 = CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0);

@@ -891,7 +890,6 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 					}

 				}

 			}

-				while (hContact = db_find_next(hContact));

 

 			CList->SortContacts();

 			hItem = CLC_ROOT;