- 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, 2 insertions, 5 deletions

diff --git a/plugins/YAPP/src/options.cpp b/plugins/YAPP/src/options.cpp
index c47ea27311..c8cc3955f0 100644
--- a/plugins/YAPP/src/options.cpp
+++ b/plugins/YAPP/src/options.cpp
@@ -98,8 +98,7 @@ void ShowExamplePopups() {
 	pd.ptzText = TranslateT("Thequickbrownfoxjumpedoverthelazydog.");

 	ShowPopup(pd);

 

-	HANDLE hContact = db_find_first();

-	while(hContact) {

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

 		if (options.av_layout != PAV_NONE && ServiceExists(MS_AV_DRAWAVATAR)) {

 			AVATARCACHEENTRY *ace = (AVATARCACHEENTRY *)CallService(MS_AV_GETAVATARBITMAP, (WPARAM)hContact, 0);

 			if (ace && (ace->dwFlags & AVS_BITMAP_VALID)) {

@@ -109,8 +108,6 @@ void ShowExamplePopups() {
 				break;

 			}

 		}

-

-		hContact = db_find_next(hContact);

 	}

 }

 

diff --git a/plugins/YAPP/src/yapp_history_dlg.cpp b/plugins/YAPP/src/yapp_history_dlg.cpp
index 71457acc41..9de3e8eda5 100644
--- a/plugins/YAPP/src/yapp_history_dlg.cpp
+++ b/plugins/YAPP/src/yapp_history_dlg.cpp
@@ -354,7 +354,7 @@ void AddEventsCustomControl(HWND hWnd, int renderer, TCHAR *filter, SIG_MATCHESF
 		ieEvent.hwnd = pwData->hIEView;

 		ieEvent.codepage = CP_ACP;

 		ieEvent.iType = IEE_LOG_MEM_EVENTS;

-		ieEvent.hContact = NULL;//db_find_first(); IEVIEW needs a contact handle !!

+		ieEvent.hContact = NULL;

 		

 		IEVIEWEVENTDATA *eventData = NULL;

 		IEVIEWEVENTDATA *cED = NULL;