Contact: group of functions gathered into the personal namespace

5 files changed, 8 insertions, 8 deletions

diff --git a/protocols/ICQ-WIM/src/groupchats.cpp b/protocols/ICQ-WIM/src/groupchats.cpp
index 82ce93f631..e92811baa1 100644
--- a/protocols/ICQ-WIM/src/groupchats.cpp
+++ b/protocols/ICQ-WIM/src/groupchats.cpp
@@ -251,7 +251,7 @@ void CIcqProto::Chat_SendPrivateMessage(GCHOOK *gch)
 	if (pCache == nullptr) {
 		hContact = CreateContact(gch->ptszUID, true);
 		setWString(hContact, "Nick", gch->ptszNick);
-		Contact_Hide(hContact);
+		Contact::Hide(hContact);
 		db_set_dw(hContact, "Ignore", "Mask1", 0);
 	}
 	else hContact = pCache->m_hContact;
diff --git a/protocols/ICQ-WIM/src/ignore.cpp b/protocols/ICQ-WIM/src/ignore.cpp
index 69c36ab244..d2d6dfb36a 100644
--- a/protocols/ICQ-WIM/src/ignore.cpp
+++ b/protocols/ICQ-WIM/src/ignore.cpp
@@ -55,7 +55,7 @@ void CIcqProto::ProcessPermissions(const JSONNode &ev)
 			p = FindContactByUIN(wszId);
 		}
 		p->m_iApparentMode = ID_STATUS_OFFLINE;
-		Contact_Hide(p->m_hContact);
+		Contact::Hide(p->m_hContact);
 		m_bIgnoreListEmpty = false;
 	}
 
diff --git a/protocols/ICQ-WIM/src/poll.cpp b/protocols/ICQ-WIM/src/poll.cpp
index d61c231344..47cbc75890 100644
--- a/protocols/ICQ-WIM/src/poll.cpp
+++ b/protocols/ICQ-WIM/src/poll.cpp
@@ -71,7 +71,7 @@ void CIcqProto::ProcessBuddyList(const JSONNode &ev)
 
 	for (auto &it : m_arCache)
 		if (!it->m_bInList && !getBool(it->m_hContact, "IcqDeleted"))
-			Contact_RemoveFromList(it->m_hContact);
+			Contact::RemoveFromList(it->m_hContact);
 
 	RetrieveUserInfo();
 }
diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp
index c02628be4a..8ebfd4a337 100644
--- a/protocols/ICQ-WIM/src/server.cpp
+++ b/protocols/ICQ-WIM/src/server.cpp
@@ -362,7 +362,7 @@ MCONTACT CIcqProto::ParseBuddyInfo(const JSONNode &buddy, MCONTACT hContact, boo
 
 	if (buddy["deleted"].as_bool()) {
 		setByte(hContact, "IcqDeleted", 1);
-		Contact_PutOnList(hContact);
+		Contact::PutOnList(hContact);
 	}
 
 	Json2string(hContact, buddy, "emailId", "Email", bIsPartial);
@@ -775,11 +775,11 @@ void CIcqProto::OnAddBuddy(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest *pReq)
 			Popup.iSeconds = 20;
 			PUAddPopupW(&Popup);
 
-			// Contact_RemoveFromList(pReq->hContact);
+			// Contact::RemoveFromList(pReq->hContact);
 		}
 
 		RetrieveUserInfo(pReq->hContact);
-		Contact_PutOnList(pReq->hContact);
+		Contact::PutOnList(pReq->hContact);
 	}
 }
 
diff --git a/protocols/ICQ-WIM/src/utils.cpp b/protocols/ICQ-WIM/src/utils.cpp
index c78cbd6972..58d57778a3 100644
--- a/protocols/ICQ-WIM/src/utils.cpp
+++ b/protocols/ICQ-WIM/src/utils.cpp
@@ -100,7 +100,7 @@ MCONTACT CIcqProto::CreateContact(const CMStringW &wszId, bool bTemporary)
 	RetrieveUserInfo(hContact);
 
 	if (bTemporary)
-		Contact_RemoveFromList(hContact);
+		Contact::RemoveFromList(hContact);
 
 	return hContact;
 }
@@ -137,7 +137,7 @@ void CIcqProto::Json2string(MCONTACT hContact, const JSONNode &node, const char
 		CMStringW wszStr(var.as_mstring());
 		if (wszStr == L"[deleted]") {
 			setByte(hContact, "IcqDeleted", 1);
-			Contact_PutOnList(hContact);
+			Contact::PutOnList(hContact);
 		}
 		else setWString(hContact, szSetting, wszStr);
 	}