- 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

2 files changed, 4 insertions, 11 deletions

diff --git a/plugins/AuthState/src/main.cpp b/plugins/AuthState/src/main.cpp
index 14e3159a1d..74226b8b43 100644
--- a/plugins/AuthState/src/main.cpp
+++ b/plugins/AuthState/src/main.cpp
@@ -169,11 +169,8 @@ int onModulesLoaded(WPARAM wParam,LPARAM lParam)
 	hExtraIcon = ExtraIcon_Register("authstate", LPGEN("Auth State"), "authgrant_icon");

 

 	// Set initial value for all contacts

-	HANDLE hContact = db_find_first();

-	while (hContact != NULL) {

+	for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

 		onExtraImageApplying((WPARAM)hContact, 1);

-		hContact = db_find_next(hContact);

-	}

 

 	hOptInitialise = HookEvent(ME_OPT_INITIALISE, onOptInitialise);

 	if (bContactMenuItem)

diff --git a/plugins/AuthState/src/options.cpp b/plugins/AuthState/src/options.cpp
index 43f6118658..e7d3961b60 100644
--- a/plugins/AuthState/src/options.cpp
+++ b/plugins/AuthState/src/options.cpp
@@ -54,13 +54,9 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				bUseGrantIcon = IsDlgButtonChecked(hwndDlg, IDC_GRANTICON);

 				bContactMenuItem = IsDlgButtonChecked(hwndDlg, IDC_ENABLEMENUITEM);

 				bIconsForRecentContacts = IsDlgButtonChecked(hwndDlg, IDC_ICONSFORRECENT);

-				{

-					HANDLE hContact = db_find_first();

-					while (hContact) {

-						onExtraImageApplying((WPARAM)hContact,0);

-						hContact = db_find_next(hContact);

-					}

-				}

+

+				for (HANDLE hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

+					onExtraImageApplying((WPARAM)hContact,0);

 

 				//Store options values to DB

 				db_set_b(NULL, MODULENAME, "EnableAuthIcon", bUseAuthIcon);