always hated these long expressions: contact_iter makes them much shorter

4 files changed, 10 insertions, 10 deletions

diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index 07bf5cd0b5..918d9441da 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -158,7 +158,7 @@ wchar_t* CVkProto::GetUserStoredPassword()
 void CVkProto::SetAllContactStatuses(int iStatus)

 {

 	debugLogA("CVkProto::SetAllContactStatuses (%d)", iStatus);

-	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))

 			SetChatStatus(hContact, iStatus);

 		else if (getWord(hContact, "Status") != iStatus)

@@ -178,7 +178,7 @@ MCONTACT CVkProto::FindUser(LONG dwUserid, bool bCreate)
 	if (!dwUserid)

 		return 0;

 

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

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

 		LONG dbUserid = getDword(hContact, "ID", VK_INVALID_USER);

 		if (dbUserid == VK_INVALID_USER)

 			continue;

@@ -204,7 +204,7 @@ MCONTACT CVkProto::FindChat(LONG dwUserid)
 	if (!dwUserid)

 		return 0;

 

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

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

 		LONG dbUserid = getDword(hContact, "vk_chat_id", VK_INVALID_USER);

 		if (dbUserid == VK_INVALID_USER)

 			continue;

diff --git a/protocols/VKontakte/src/vk_dialogs.cpp b/protocols/VKontakte/src/vk_dialogs.cpp
index 6e957b7b79..09eb855ccf 100644
--- a/protocols/VKontakte/src/vk_dialogs.cpp
+++ b/protocols/VKontakte/src/vk_dialogs.cpp
@@ -157,7 +157,7 @@ CVkInviteChatForm::CVkInviteChatForm(CVkProto *proto) :
 

 void CVkInviteChatForm::OnInitDialog()

 {

-	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)) {

 			wchar_t *pwszNick = pcli->pfnGetContactDisplayName(hContact, 0);

 			m_cbxCombo.AddString(pwszNick, hContact);

@@ -195,7 +195,7 @@ void CVkGCCreateForm::OnInitDialog()
 void CVkGCCreateForm::btnOk_OnOk(CCtrlButton*)

 {

 	CMStringA szUIds;

-	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;

 

@@ -219,7 +219,7 @@ void CVkGCCreateForm::btnOk_OnOk(CCtrlButton*)
 

 void CVkGCCreateForm::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) || m_proto->getDword(hContact, "ID") == VK_FEED_USER)

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

diff --git a/protocols/VKontakte/src/vk_history.cpp b/protocols/VKontakte/src/vk_history.cpp
index 09447ea84f..4781cb4cdb 100644
--- a/protocols/VKontakte/src/vk_history.cpp
+++ b/protocols/VKontakte/src/vk_history.cpp
@@ -61,7 +61,7 @@ INT_PTR __cdecl CVkProto::SvcGetAllServerHistory(WPARAM, LPARAM)
 	if (IDNO == MessageBoxW(nullptr, str, TranslateT("Attention!"), MB_ICONWARNING | MB_YESNO))

 		return 0;

 

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

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

 		LONG userID = getDword(hContact, "ID", VK_INVALID_USER);

 		if (userID == VK_INVALID_USER || userID == VK_FEED_USER)

 			continue;

diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp
index c7efb61344..044b6e5757 100644
--- a/protocols/VKontakte/src/vk_thread.cpp
+++ b/protocols/VKontakte/src/vk_thread.cpp
@@ -550,7 +550,7 @@ void CVkProto::RetrieveUsersInfo(bool bFreeOffline, bool bRepeat)
 

 	CMStringA userIDs;

 	int i = 0;

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

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

 		LONG userID = getDword(hContact, "ID", VK_INVALID_USER);

 		if (userID == VK_INVALID_USER || userID == VK_FEED_USER || userID < 0)

 			continue;

@@ -602,7 +602,7 @@ void CVkProto::OnReceiveUserInfo(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pRe
 	MCONTACT hContact;

 	LIST<void> arContacts(10, PtrKeySortT);

 

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

+	for (auto &hContact : acc_contact_iter())

 		if (!isChatRoom(hContact) && !IsGroupUser(hContact))

 			arContacts.insert((HANDLE)hContact);

 

@@ -755,7 +755,7 @@ void CVkProto::OnReceiveFriends(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq
 

 	LIST<void> arContacts(10, PtrKeySortT);

 

-	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) && !IsGroupUser(hContact))

 			setByte(hContact, "Auth", 1);

 		db_unset(hContact, m_szModuleName, "ReqAuth");