From 61b9b52fcc31ff4c0a533100c15f8d4fa7b2b93a Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 16 Mar 2018 21:10:14 +0300
Subject: class renaming, part II

---
 protocols/MinecraftDynmap/src/chat.cpp          | 2 +-
 protocols/Omegle/src/chat.cpp                   | 2 +-
 protocols/Sametime/src/sametime.cpp             | 2 +-
 protocols/Sametime/src/session_announce_win.cpp | 2 +-
 protocols/Sametime/src/userlist.cpp             | 6 +++---
 protocols/Steam/src/steam_contacts.cpp          | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'protocols')

diff --git a/protocols/MinecraftDynmap/src/chat.cpp b/protocols/MinecraftDynmap/src/chat.cpp
index d51d02fcd1..7fd96f73e2 100644
--- a/protocols/MinecraftDynmap/src/chat.cpp
+++ b/protocols/MinecraftDynmap/src/chat.cpp
@@ -189,7 +189,7 @@ MCONTACT MinecraftDynmapProto::GetChatHandle()
 	/*if (chatHandle_ != NULL)
 		return chatHandle_;
 
-	for (auto &hContact : acc_contact_iter()) {
+	for (auto &hContact : AccContacts()) {
 		if (db_get_b(hContact, m_szModuleName, "ChatRoom", 0) > 0) {
 			ptrA id = db_get_sa(hContact, m_szModuleName, "ChatRoomId");
 			if (id != NULL && !strcmp(id, m_szModuleName))
diff --git a/protocols/Omegle/src/chat.cpp b/protocols/Omegle/src/chat.cpp
index e3ab206286..5af8301681 100644
--- a/protocols/Omegle/src/chat.cpp
+++ b/protocols/Omegle/src/chat.cpp
@@ -336,7 +336,7 @@ MCONTACT OmegleProto::GetChatHandle()
 	/*if (facy.chatHandle_ != NULL)
 		return facy.chatHandle_;
 
-		for (auto &hContact : acc_contact_iter()) {
+		for (auto &hContact : AccContacts()) {
 		if (db_get_b(hContact, m_szModuleName, "ChatRoom", 0) > 0) {
 		ptrA id = db_get_sa(hContact, m_szModuleName, "ChatRoomId");
 		if (id != NULL && !mir_strcmp(id, m_szModuleName))
diff --git a/protocols/Sametime/src/sametime.cpp b/protocols/Sametime/src/sametime.cpp
index 01770d382c..6f0d783b14 100644
--- a/protocols/Sametime/src/sametime.cpp
+++ b/protocols/Sametime/src/sametime.cpp
@@ -223,7 +223,7 @@ void CSametimeProto::SetAllOffline()
 {
 	debugLogW(L"SetAllOffline() start");
 
-	for (auto &hContact : acc_contact_iter()) {
+	for (auto &hContact : AccContacts()) {
 		if (db_get_b(hContact, m_szModuleName, "ChatRoom", 0)) {
 			db_delete_contact(hContact);
 			continue;
diff --git a/protocols/Sametime/src/session_announce_win.cpp b/protocols/Sametime/src/session_announce_win.cpp
index 50f564f1d3..6016e9df27 100644
--- a/protocols/Sametime/src/session_announce_win.cpp
+++ b/protocols/Sametime/src/session_announce_win.cpp
@@ -40,7 +40,7 @@ INT_PTR CALLBACK SessionAnnounceDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wPara
 				lvI.iItem = 0;
 				lvI.iSubItem = 0;
 
-				for (auto &hContact : proto->acc_contact_iter()) {
+				for (auto &hContact : proto->AccContacts()) {
 					if (db_get_b(hContact, proto->m_szModuleName, "ChatRoom", 0) == 0
 						&& db_get_w(hContact, proto->m_szModuleName, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE) {
 						lvI.lParam = (LPARAM)hContact;
diff --git a/protocols/Sametime/src/userlist.cpp b/protocols/Sametime/src/userlist.cpp
index 777d174aa0..f155fa6cb0 100644
--- a/protocols/Sametime/src/userlist.cpp
+++ b/protocols/Sametime/src/userlist.cpp
@@ -4,7 +4,7 @@
 MCONTACT CSametimeProto::FindContactByUserId(const char* id)
 {
 	DBVARIANT dbv;
-	for (auto &hContact : acc_contact_iter()) {
+	for (auto &hContact : AccContacts()) {
 		if (!db_get_utf(hContact, m_szModuleName, "stid", &dbv)) {
 			if (dbv.pszVal && mir_strcmp(id, dbv.pszVal) == 0) {
 				db_free(&dbv);
@@ -204,7 +204,7 @@ void CSametimeProto::ExportContactsToList(mwSametimeList* user_list)
 	mwIdBlock uid;
 
 	GList* gl = nullptr;
-	for (auto &hContact : acc_contact_iter()) {
+	for (auto &hContact : AccContacts()) {
 		if (!db_get_utf(hContact, m_szModuleName, "stid", &dbv)) {
 			if (dbv.pszVal) {
 				if (GetAwareIdFromContact(hContact, &id_block)) {
@@ -594,7 +594,7 @@ void CSametimeProto::UserListCreate()
 	mwAwareIdBlock id_block;
 	GList *gl = nullptr;
 
-	for (auto &hContact : acc_contact_iter()) {
+	for (auto &hContact : AccContacts()) {
 		if (db_get_b(hContact, m_szModuleName, "ChatRoom", 0) == 0 /*&&  proto && !mir_strcmp( PROTO, proto)*/) {
 			if (!db_get_utf(hContact, m_szModuleName, "stid", &dbv)) {
 				if (dbv.pszVal) {
diff --git a/protocols/Steam/src/steam_contacts.cpp b/protocols/Steam/src/steam_contacts.cpp
index 9bdfdc8bf3..6bdae22900 100644
--- a/protocols/Steam/src/steam_contacts.cpp
+++ b/protocols/Steam/src/steam_contacts.cpp
@@ -2,7 +2,7 @@
 
 void CSteamProto::SetAllContactStatuses(int status)
 {
-	for (auto &hContact : acc_contact_iter())
+	for (auto &hContact : AccContacts())
 		SetContactStatus(hContact, status);
 }
 
@@ -71,7 +71,7 @@ MCONTACT CSteamProto::GetContactFromAuthEvent(MEVENT hEvent)
 
 MCONTACT CSteamProto::GetContact(const char *steamId)
 {
-	for (auto &hContact : acc_contact_iter()) {
+	for (auto &hContact : AccContacts()) {
 		ptrA cSteamId(getStringA(hContact, "SteamID"));
 		if (!mir_strcmp(cSteamId, steamId))
 			return hContact;
@@ -428,7 +428,7 @@ void CSteamProto::OnGotFriendList(const JSONNode &root, void*)
 	}
 
 	// Check and update contacts in database
-	for (auto &hContact : acc_contact_iter()) {
+	for (auto &hContact : AccContacts()) {
 		ptrA steamId(getStringA(hContact, "SteamID"));
 		if (steamId == nullptr)
 			continue;
-- 
cgit v1.2.3