Contact: group of functions gathered into the personal namespace

4 files changed, 8 insertions, 8 deletions

diff --git a/plugins/Clist_modern/src/modern_awaymsg.cpp b/plugins/Clist_modern/src/modern_awaymsg.cpp
index b4f0f5f6a4..31a9bcabed 100644
--- a/plugins/Clist_modern/src/modern_awaymsg.cpp
+++ b/plugins/Clist_modern/src/modern_awaymsg.cpp
@@ -144,7 +144,7 @@ void amRequestAwayMsg(MCONTACT hContact)
 		return;

 

 	//Do not re-ask for chat rooms

-	if (!Contact_IsGroupChat(hContact))

+	if (!Contact::IsGroupChat(hContact))

 		amAddHandleToChain(hContact);

 }

 

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 417ab0a97e..972ed12f4d 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1306,7 +1306,7 @@ static LRESULT clcOnIntmGroupChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wPara
 		flags = contact->flags;

 	}

 	Clist_DeleteItemFromTree(hwnd, wParam);

-	if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !Contact_IsHidden(wParam)) {

+	if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !Contact::IsHidden(wParam)) {

 		g_clistApi.pfnAddContactToTree(hwnd, dat, wParam, 1, 1);

 		if (Clist_FindItem(hwnd, dat, wParam, &contact)) {

 			memcpy(contact->iExtraImage, iExtraImage, sizeof(iExtraImage));

@@ -1658,7 +1658,7 @@ int ClcDoProtoAck(ACKDATA *ack)
 	if (ack->type == ACKTYPE_AWAYMSG) {

 		if (ack->result == ACKRESULT_SUCCESS && ack->lParam) {

 			if (ack->szModule != nullptr)

-				if (Contact_IsGroupChat(ack->hContact, ack->szModule))

+				if (Contact::IsGroupChat(ack->hContact, ack->szModule))

 					return 0;

 

 			g_plugin.setWString(ack->hContact, "StatusMsg", (const wchar_t *)ack->lParam);

@@ -1666,7 +1666,7 @@ int ClcDoProtoAck(ACKDATA *ack)
 		}

 		else {

 			if (ack->szModule != nullptr)

-				if (Contact_IsGroupChat(ack->hContact, ack->szModule))

+				if (Contact::IsGroupChat(ack->hContact, ack->szModule))

 					return 0;

 

 			if (ack->hContact) {

diff --git a/plugins/Clist_modern/src/modern_clc.h b/plugins/Clist_modern/src/modern_clc.h
index fb06744325..1d0d2328e4 100644
--- a/plugins/Clist_modern/src/modern_clc.h
+++ b/plugins/Clist_modern/src/modern_clc.h
@@ -200,7 +200,7 @@ struct ClcContact : public ClcContactBase
 	{	return (style & CLS_CHECKBOXES && type == CLCIT_CONTACT) || (style & CLS_GROUPCHECKBOXES && type == CLCIT_GROUP) || (type == CLCIT_INFO && flags & CLCIIF_CHECKBOX);

 	}

 	__forceinline bool isChat() const

-	{	return (type == CLCIT_CONTACT) && Contact_IsGroupChat(hContact, pce->szProto);

+	{	return (type == CLCIT_CONTACT) && Contact::IsGroupChat(hContact, pce->szProto);

 	}

 };

 

diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index 5a6d7cdebb..61b6d6eca5 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -326,12 +326,12 @@ ClcCacheEntry* cliCreateCacheItem(MCONTACT hContact)
 

 	pdnce->hContact = hContact;

 	pdnce->szProto = Proto_GetBaseAccountName(hContact);

-	pdnce->bIsHidden = Contact_IsHidden(hContact);

+	pdnce->bIsHidden = Contact::IsHidden(hContact);

 	pdnce->m_bIsSub = db_mc_isSub(hContact) != 0;

 	pdnce->m_bNoHiddenOffline = g_plugin.getByte(hContact, "noOffline");

 	pdnce->IdleTS = db_get_dw(hContact, pdnce->szProto, "IdleTS", 0);

 	pdnce->ApparentMode = db_get_w(hContact, pdnce->szProto, "ApparentMode", 0);

-	pdnce->NotOnList = !Contact_OnList(hContact);

+	pdnce->NotOnList = !Contact::OnList(hContact);

 	pdnce->IsExpanded = g_plugin.getByte(hContact, "Expanded");

 	pdnce->dwLastOnlineTime = db_get_dw(hContact, pdnce->szProto, "LastSeen", 0);

 	pdnce->dwLastMsgTime = -1;

@@ -396,7 +396,7 @@ int cliGetGroupContentsCount(ClcGroup *group, int visibleOnly)
 

 int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, ClcData *dat)

 {

-	int dbHidden = Contact_IsHidden(hContact); // default hidden state, always respect it.

+	int dbHidden = Contact::IsHidden(hContact); // default hidden state, always respect it.

 	int filterResult = 1;

 	int searchResult = 0;

 	ClcCacheEntry *pdnce = Clist_GetCacheEntry(hContact);