always hated these long expressions: contact_iter makes them much shorter

8 files changed, 13 insertions, 13 deletions

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index a2eeaf620f..c81f133583 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -654,7 +654,7 @@ class CGroupchatInviteDlg : public CJabberDlgBase
 

 	void FilterList(CCtrlClc *)

 	{

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

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

 			char *proto = GetContactProto(hContact);

 			if (mir_strcmp(proto, m_proto->m_szModuleName) || m_proto->isChatRoom(hContact))

 				if (HANDLE hItem = m_clc.FindContact(hContact))

@@ -763,7 +763,7 @@ public:
 		HWND hwndList = GetDlgItem(m_hwnd, IDC_CLIST);

 

 		// invite users from roster

-		for (MCONTACT hContact = db_find_first(m_proto->m_szModuleName); hContact; hContact = db_find_next(hContact, m_proto->m_szModuleName)) {

+		for (auto &hContact : m_proto->acc_contact_iter()) {

 			if (m_proto->isChatRoom(hContact))

 				continue;

 

diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index 5eb0a99b24..503937a5d0 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -444,7 +444,7 @@ BOOL CJabberProto::DBCheckIsTransportedContact(const wchar_t *jid, MCONTACT hCon
 

 void CJabberProto::CheckAllContactsAreTransported()

 {

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

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

 		ptrW jid(getWStringA(hContact, "jid"));

 		if (jid)

 			DBCheckIsTransportedContact(jid, hContact);

diff --git a/protocols/JabberG/src/jabber_list.cpp b/protocols/JabberG/src/jabber_list.cpp
index 94ba7846e8..51beefb3dc 100644
--- a/protocols/JabberG/src/jabber_list.cpp
+++ b/protocols/JabberG/src/jabber_list.cpp
@@ -89,7 +89,7 @@ void JABBER_RESOURCE_STATUS::Release()
 

 void CJabberProto::ListInit(void)

 {

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

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

 		if (isChatRoom(hContact)) {

 			ptrW jid(getWStringA(hContact, "ChatRoomID"));

 			if (jid != nullptr)

diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index 94ba4caf28..54ee815d48 100755
--- a/protocols/JabberG/src/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
@@ -1021,7 +1021,7 @@ void CJabberProto::_RosterHandleGetRequest(HXML node, CJabberIqInfo*)
 		}

 

 		// now it is require to process whole contact list to add not in roster contacts

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

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

 			ptrW tszJid(getWStringA(hContact, "jid"));

 			if (tszJid == nullptr)

 				continue;

diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 4e37896abd..32ee36c4dc 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -422,7 +422,7 @@ public:
 

 			SendDlgItemMessage(m_hwnd, IDC_COMBO_VALUES, CB_RESETCONTENT, 0, 0);

 			{

-				for (MCONTACT hContact = db_find_first(m_proto->m_szModuleName); hContact; hContact = db_find_next(hContact, m_proto->m_szModuleName)) {

+				for (auto &hContact : m_proto->acc_contact_iter()) {

 					ptrW jid( m_proto->getWStringA(hContact, "jid"));

 					if (jid != nullptr)

 						SendDlgItemMessage(m_hwnd, IDC_COMBO_VALUES, CB_ADDSTRING, 0, jid);

@@ -1304,7 +1304,7 @@ void CJabberDlgPrivacyLists::CListResetOptions(HWND)
 

 void CJabberDlgPrivacyLists::CListFilter(HWND)

 {

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

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

 		char *proto = GetContactProto(hContact);

 		if (!proto || mir_strcmp(proto, m_proto->m_szModuleName))

 			if (HANDLE hItem = m_clcClist.FindContact(hContact))

@@ -1361,7 +1361,7 @@ void CJabberDlgPrivacyLists::CListApplyList(HWND hwndList, CPrivacyList *pList)
 			CListResetIcons(hwndList, hItem, bHideIcons);

 	}

 

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

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

 		HANDLE hItem = m_clcClist.FindContact(hContact);

 		if (hItem)

 			CListResetIcons(hwndList, hItem, bHideIcons);

@@ -1459,7 +1459,7 @@ void CJabberDlgPrivacyLists::CListBuildList(HWND hwndList, CPrivacyList *pList)
 			pList->AddRule(Jid, szJid, FALSE, dwOrder++, dwPackets);

 	}

 

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

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

 		hItem = m_clcClist.FindContact(hContact);

 

 		ptrW jid( m_proto->getWStringA(hContact, "jid"));

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index eedaec74af..e75eb2fdfa 100755
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -301,7 +301,7 @@ int CJabberProto::OnModulesLoadedEx(WPARAM, LPARAM)
 	CheckAllContactsAreTransported();

 

 	// Set all contacts to offline

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

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

 		SetContactOfflineStatus(hContact);

 

 		if (getByte(hContact, "IsTransport", 0)) {

diff --git a/protocols/JabberG/src/jabber_rc.cpp b/protocols/JabberG/src/jabber_rc.cpp
index e0201f51ff..5343ea2312 100644
--- a/protocols/JabberG/src/jabber_rc.cpp
+++ b/protocols/JabberG/src/jabber_rc.cpp
@@ -464,7 +464,7 @@ int CJabberProto::AdhocOptionsHandler(HXML, CJabberIqInfo *pInfo, CJabberAdhocSe
 int CJabberProto::RcGetUnreadEventsCount()

 {

 	int nEventsSent = 0;

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

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

 		ptrW jid( getWStringA(hContact, "jid"));

 		if (jid == nullptr) continue;

 

@@ -550,7 +550,7 @@ int CJabberProto::AdhocForwardHandler(HXML, CJabberIqInfo *pInfo, CJabberAdhocSe
 		m_bRcMarkMessagesAsRead = bRemoveCListEvents ? 1 : 0;

 

 		int nEventsSent = 0;

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

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

 			ptrW tszJid( getWStringA(hContact, "jid"));

 			if (tszJid == nullptr)

 				continue;

diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index a8b2b49bd4..dbadaa861f 100755
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -521,7 +521,7 @@ recvRest:
 

 			// Set all contacts to offline

 			debugLogA("1");

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

+			for (auto &hContact : acc_contact_iter())

 				SetContactOfflineStatus(hContact);

 			debugLogA("2");