always hated these long expressions: contact_iter makes them much shorter

1 files changed, 2 insertions, 2 deletions

diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp
index 5b07d56bd4..ceeff234c1 100644
--- a/plugins/SmileyAdd/src/smileys.cpp
+++ b/plugins/SmileyAdd/src/smileys.cpp
@@ -748,7 +748,7 @@ void SmileyCategoryListType::DeleteAccountAsCategory(PROTOACCOUNT *acc)
 {

 	CMStringW tname(_A2T(acc->szModuleName));

 

-	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

+	for (auto &hContact : contact_iter()) {

 		char *proto = GetContactProto(hContact);

 		if (proto == nullptr)

 			continue;

@@ -841,7 +841,7 @@ void SmileyCategoryListType::AddAllProtocolsAsCategory(void)
 	for (int i = 0; i < protoCount; i++)

 		AddAccountAsCategory(accList[i], defaultFile);

 

-	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact))

+	for (auto &hContact : contact_iter())

 		AddContactTransportAsCategory(hContact, defaultFile);

 

 	CMStringW cats;