- 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

1 files changed, 2 insertions, 7 deletions

diff --git a/plugins/NoHistory/src/options.cpp b/plugins/NoHistory/src/options.cpp
index 5f9c256492..8dae1fe190 100644
--- a/plugins/NoHistory/src/options.cpp
+++ b/plugins/NoHistory/src/options.cpp
@@ -84,8 +84,7 @@ static void ResetListOptions(HWND hwndList)
 

 static void SetAllContactIcons(HWND hwndList)

 {

-	HANDLE hContact = db_find_first();

-	do {

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

 		char *proto = GetContactProto(hContact);

 		bool chat_room = (proto && db_get_b(hContact, proto, "ChatRoom", 0) != 0);

 

@@ -97,7 +96,6 @@ static void SetAllContactIcons(HWND hwndList)
 			}

 		}

 	}

-		while(hContact = db_find_next(hContact));

 }

 											 

 static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

@@ -200,8 +198,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		case 0:

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

 			case PSN_APPLY:

-				HANDLE hContact = db_find_first();

-				do {

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

 					char *proto = GetContactProto(hContact);

 					bool chat_room = (proto && db_get_b(hContact, proto, "ChatRoom", 0) != 0);

 

@@ -213,8 +210,6 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 						}

 					}

 				}

-					while(hContact = db_find_next(hContact));

-

 				return TRUE;

 			}

 		}