- 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, 4 insertions, 20 deletions

diff --git a/protocols/AimOscar/src/theme.cpp b/protocols/AimOscar/src/theme.cpp
index b5c0ae20a7..3dc5dce55f 100644
--- a/protocols/AimOscar/src/theme.cpp
+++ b/protocols/AimOscar/src/theme.cpp
@@ -144,46 +144,30 @@ void set_contact_icon(CAimProto* ppro, HANDLE hContact)
 

 void remove_AT_icons(CAimProto* ppro)

 {

-	HANDLE hContact = db_find_first();

-	while (hContact) {

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

 		if (ppro->is_my_contact(hContact) && !ppro->getByte(hContact, "ChatRoom", 0)) 

 			ExtraIcon_Clear(hExtraAT, hContact);

-

-		hContact = db_find_next(hContact);

-	}

 }

 

 void remove_ES_icons(CAimProto* ppro)

 {

-	HANDLE hContact = db_find_first();

-	while (hContact) {

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

 		if (ppro->is_my_contact(hContact) && !ppro->getByte(hContact, "ChatRoom", 0)) 

 			ExtraIcon_Clear(hExtraES, hContact);

-

-		hContact = db_find_next(hContact);

-	}

 }

 

 void add_AT_icons(CAimProto* ppro)

 {

-	HANDLE hContact = db_find_first();

-	while (hContact) {

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

 		if (ppro->is_my_contact(hContact)) 

 			set_AT_icon(ppro, hContact);

-

-		hContact = db_find_next(hContact);

-	}

 }

 

 void add_ES_icons(CAimProto* ppro)

 {

-	HANDLE hContact = db_find_first();

-	while (hContact) {

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

 		if (ppro->is_my_contact(hContact)) 

 			set_ES_icon(ppro, hContact);

-

-		hContact = db_find_next(hContact);

-	}

 }

 

 void InitExtraIcons(void)