Contact: group of functions gathered into the personal namespace

9 files changed, 14 insertions, 14 deletions

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 839c019d94..c4bd6bb3d6 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -317,7 +317,7 @@ void CJabberProto::GcQuit(JABBER_LIST_ITEM *item, int code, const TiXmlElement *
 	else

 		Chat_Control(m_szModuleName, wszRoomJid, SESSION_OFFLINE);

 

-	Contact_Hide(item->hContact, false);

+	Contact::Hide(item->hContact, false);

 	item->si = nullptr;

 	item->bChatLogging = false;

 

@@ -1158,7 +1158,7 @@ static void sttNickListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK*
 			if (auto *tmp = wcschr(psr.id.w, '/'))

 				*tmp = 0;

 			psr.nick.w = psr.id.w;

-			Contact_AddBySearch(ppro->m_szModuleName, &psr, g_clistApi.hwndContactList);

+			Contact::AddBySearch(ppro->m_szModuleName, &psr, g_clistApi.hwndContactList);

 		}

 		break;

 	}

@@ -1301,7 +1301,7 @@ static void sttSendPrivateMessage(CJabberProto *ppro, JABBER_LIST_ITEM *item, co
 		if (r)

 			ppro->setWord(hContact, "Status", r->m_iStatus);

 

-		Contact_Hide(hContact);

+		Contact::Hide(hContact);

 		ppro->setUString(hContact, "Nick", nick);

 		db_set_dw(hContact, "Ignore", "Mask1", 0);

 		CallService(MS_MSG_SENDMESSAGE, hContact, 0);

diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp
index e7b68a9d64..7ec1988e6a 100644
--- a/protocols/JabberG/src/jabber_disco.cpp
+++ b/protocols/JabberG/src/jabber_disco.cpp
@@ -1167,7 +1167,7 @@ public:
 				case SD_ACT_ROSTER:

 					{

 						MCONTACT hContact = m_proto->DBCreateContact(pNode->GetJid(), pNode->GetName(), false, false);

-						Contact_PutOnList(hContact);

+						Contact::PutOnList(hContact);

 						JABBER_LIST_ITEM *item = m_proto->ListAdd(LIST_VCARD_TEMP, pNode->GetJid(), hContact);

 						item->bUseResource = true;

 					}

diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp
index 3dc078fa8d..043c438c95 100644
--- a/protocols/JabberG/src/jabber_events.cpp
+++ b/protocols/JabberG/src/jabber_events.cpp
@@ -154,7 +154,7 @@ void __cdecl CJabberProto::OnAddContactForever(MCONTACT hContact)
 

 	SendGetVcard(hContact);

 

-	Contact_Hide(hContact, false);

+	Contact::Hide(hContact, false);

 }

 

 int __cdecl CJabberProto::OnDbMarkedRead(WPARAM, LPARAM hDbEvent)

diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp
index 7a90d3a683..d73785b9f5 100644
--- a/protocols/JabberG/src/jabber_iq_handlers.cpp
+++ b/protocols/JabberG/src/jabber_iq_handlers.cpp
@@ -250,7 +250,7 @@ bool CJabberProto::OnRosterPushRequest(const TiXmlElement*, CJabberIqInfo *pInfo
 				UpdateSubscriptionInfo(item->hContact, item);

 			}

 			else if (isChatRoom(item->hContact))

-				Contact_Hide(item->hContact, false);

+				Contact::Hide(item->hContact, false);

 			else

 				UpdateSubscriptionInfo(item->hContact, item);

 		}

diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index cc2d4883d0..db8652dfd4 100644
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -501,7 +501,7 @@ void CJabberProto::OnIqResultGetRoster(const TiXmlElement *iqNode, CJabberIqInfo
 				*p = 0;

 			Chat_NewSession(GCW_CHATROOM, m_szModuleName, Utf2T(jid), Utf2T(szTitle));

 

-			Contact_Hide(hContact, false);

+			Contact::Hide(hContact, false);

 			chatRooms.insert((HANDLE)hContact);

 		}

 		else UpdateSubscriptionInfo(hContact, item);

diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp
index 0e1ce56479..88a6909eca 100644
--- a/protocols/JabberG/src/jabber_misc.cpp
+++ b/protocols/JabberG/src/jabber_misc.cpp
@@ -48,7 +48,7 @@ void CJabberProto::AddContactToRoster(const char *jid, const char *nick, const c
 void CJabberProto::DBAddAuthRequest(const char *jid, const char *nick)

 {

 	MCONTACT hContact = DBCreateContact(jid, nick, true, true);

-	Contact_Hide(hContact, false);

+	Contact::Hide(hContact, false);

 

 	DB::AUTH_BLOB blob(hContact, nick, nullptr, nullptr, jid, nullptr);

 

@@ -89,7 +89,7 @@ MCONTACT CJabberProto::DBCreateContact(const char *jid, const char *nick, bool t
 		setUString(hNewContact, "Nick", ptrA(JabberNickFromJID(szJid)));

 

 	if (temporary)

-		Contact_RemoveFromList(hNewContact);

+		Contact::RemoveFromList(hNewContact);

 	else

 		SendGetVcard(hNewContact);

 	

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index d11ab271d6..946ae533f4 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -366,7 +366,7 @@ MCONTACT CJabberProto::AddToListByJID(const char *newJid, uint32_t flags)
 

 	MCONTACT hContact = DBCreateContact(newJid, nullptr, true, false);

 	if (flags & PALF_TEMPORARY)

-		Contact_Hide(hContact);

+		Contact::Hide(hContact);

 

 	return hContact;

 }

@@ -426,7 +426,7 @@ int CJabberProto::Authorize(MEVENT hDbEvent)
 			if (MCONTACT hContact = AddToListByJID(blob.get_email(), 0)) {

 				// Trigger actual add by removing the "NotOnList" added by AddToListByJID()

 				// See AddToListByJID() and JabberDbSettingChanged().

-				Contact_PutOnList(hContact);

+				Contact::PutOnList(hContact);

 			}

 		}

 	}

diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp
index e831e22af8..63fbd74e8b 100644
--- a/protocols/JabberG/src/jabber_svc.cpp
+++ b/protocols/JabberG/src/jabber_svc.cpp
@@ -442,7 +442,7 @@ INT_PTR __cdecl CJabberProto::JabberServiceParseXmppURI(WPARAM, LPARAM lParam)
 			psr.flags = PSR_UNICODE;

 			psr.nick.w = szJid;

 			psr.id.w = szJid;

-			Contact_AddBySearch(m_szModuleName, &psr);

+			Contact::AddBySearch(m_szModuleName, &psr);

 		}

 		return 0;

 	}

diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index 4308c04e18..cedb5ed81b 100644
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -1671,7 +1671,7 @@ void CJabberProto::OnProcessPresence(const TiXmlElement *node, ThreadData *info)
 			ListRemoveResource(LIST_ROSTER, from);

 

 			hContact = HContactFromJID(from);

-			if (hContact && !Contact_OnList(hContact)) {

+			if (hContact && !Contact::OnList(hContact)) {

 				// remove selfcontact, if where is no more another resources

 				if (item->arResources.getCount() == 1 && ResourceInfoFromJID(info->fullJID))

 					ListRemoveResource(LIST_ROSTER, info->fullJID);

@@ -1721,7 +1721,7 @@ void CJabberProto::OnProcessPresence(const TiXmlElement *node, ThreadData *info)
 						if (item)

 							item->hContact = hContact;

 						setUString(hContact, "Nick", szNick);

-						Contact_PutOnList(hContact);

+						Contact::PutOnList(hContact);

 					}

 				}

 			}