From bcb27264ba737778e5d3edad36088bacf74f0236 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 9 Apr 2013 20:03:46 +0000
Subject: - short function names allows to write database loops in one string;
 - 'continue' operator can be used then; - multiple bugs fixed in clists; -
 code becomes much more compact;

git-svn-id: http://svn.miranda-ng.org/main/trunk@4403 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TipperYM/src/options.cpp | 18 ++++--------------
 plugins/TipperYM/src/popwin.cpp  |  8 ++------
 plugins/TipperYM/src/subst.cpp   |  3 +--
 3 files changed, 7 insertions(+), 22 deletions(-)

(limited to 'plugins/TipperYM/src')

diff --git a/plugins/TipperYM/src/options.cpp b/plugins/TipperYM/src/options.cpp
index 8436b5f632..84ad4272c8 100644
--- a/plugins/TipperYM/src/options.cpp
+++ b/plugins/TipperYM/src/options.cpp
@@ -2087,15 +2087,10 @@ INT_PTR CALLBACK DlgProcFavouriteContacts(HWND hwndDlg, UINT msg, WPARAM wParam,
 			SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETGREYOUTFLAGS, 0, 0);
 			SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETLEFTMARGIN, 2, 0);
 
-			HANDLE hContact, hItem;
-			hContact = db_find_first();
-			while (hContact)
-			{
-				hItem = (HANDLE) SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);
+			for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+				HANDLE hItem = (HANDLE) SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);
 				if (hItem && db_get_b(hContact, MODULE, "FavouriteContact", 0))
 					SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETCHECKMARK, (WPARAM)hItem, 1);
-
-				hContact = db_find_next(hContact);
 			}
 
 			CheckDlgButton(hwndDlg, IDC_CHK_HIDEOFFLINE, opt.iFavoriteContFlags & FAVCONT_HIDE_OFFLINE);
@@ -2109,22 +2104,17 @@ INT_PTR CALLBACK DlgProcFavouriteContacts(HWND hwndDlg, UINT msg, WPARAM wParam,
 			{
 				case IDC_BTN_OK:
 				{
-					HANDLE hContact, hItem;
 					BYTE isChecked;
 					int count = 0;
 
-					hContact = db_find_first();
-					while (hContact)
-					{
-						hItem = (HANDLE) SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);
+					for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
+						HANDLE hItem = (HANDLE) SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);
 						if (hItem)
 						{
 							isChecked = (BYTE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_GETCHECKMARK, (WPARAM)hItem, 0);
 							db_set_b(hContact, MODULE, "FavouriteContact", isChecked);
 							if (isChecked) count++;
 						}
-
-						hContact = db_find_next(hContact);
 					}
 					db_set_dw(0, MODULE, "FavouriteContactsCount", count);
 
diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp
index 155990697d..290c1fcdd6 100644
--- a/plugins/TipperYM/src/popwin.cpp
+++ b/plugins/TipperYM/src/popwin.cpp
@@ -1551,15 +1551,13 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 
 				if (dwItems & TRAYTIP_NUMCONTACTS) {
 					int iCount = 0, iCountOnline = 0;
-					HANDLE hContact = db_find_first();
-					while (hContact) {
+					for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 						char *proto = GetContactProto(hContact);
 						if (proto && !strcmp(proto, pa->szModuleName)) {
 							if (db_get_w(hContact, proto, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE)
 								iCountOnline++;
 							iCount++;
 						}
-						hContact = db_find_next(hContact);
 					}
 					mir_sntprintf(buff, 64, _T("(%d/%d)"), iCountOnline, iCount);
 				} 
@@ -1678,8 +1676,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 					bool bTitlePainted = false;
 					int iCount = 0, iCountOnline = 0;
 
-					HANDLE hContact = db_find_first();
-					while (hContact) {
+					for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {
 						if (db_get_b(hContact, MODULE, "FavouriteContact", 0)) {
 							char *proto = GetContactProto(hContact);
 							if (proto) {
@@ -1710,7 +1707,6 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 								}
 							}
 						}
-						hContact = db_find_next(hContact);
 					}
 
 					int index = pwd->iRowCount - 1;
diff --git a/plugins/TipperYM/src/subst.cpp b/plugins/TipperYM/src/subst.cpp
index 779fe76bf8..9740dbd1d2 100644
--- a/plugins/TipperYM/src/subst.cpp
+++ b/plugins/TipperYM/src/subst.cpp
@@ -885,8 +885,7 @@ TCHAR *GetProtoExtraStatusMessage(char *szProto)
 			swzText = mir_tstrdup(dbv.ptszVal);
 		db_free(&dbv);
 
-		if (ServiceExists(MS_VARS_FORMATSTRING))
-		{
+		if (ServiceExists(MS_VARS_FORMATSTRING)) {
 			HANDLE hContact = db_find_first();
 			char *proto = GetContactProto(hContact);
 			while(!proto)
-- 
cgit v1.2.3