From 500dd4848842f6d4207584417448586d060fbd6a Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 31 Jul 2022 18:07:27 +0300
Subject: Contact: group of functions gathered into the personal namespace

---
 plugins/SeenPlugin/src/menu.cpp     | 2 +-
 plugins/SeenPlugin/src/userinfo.cpp | 2 +-
 plugins/SeenPlugin/src/utils.cpp    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/SeenPlugin')

diff --git a/plugins/SeenPlugin/src/menu.cpp b/plugins/SeenPlugin/src/menu.cpp
index c24345000a..f23bf1300e 100644
--- a/plugins/SeenPlugin/src/menu.cpp
+++ b/plugins/SeenPlugin/src/menu.cpp
@@ -37,7 +37,7 @@ INT_PTR MenuitemClicked(WPARAM hContact, LPARAM)
 int BuildContactMenu(WPARAM hContact, LPARAM)
 {
 	char *szProto = Proto_GetBaseAccountName(hContact);
-	if (!IsWatchedProtocol(szProto) || Contact_IsGroupChat(hContact, szProto) || !g_plugin.getByte("MenuItem", 1)) {
+	if (!IsWatchedProtocol(szProto) || Contact::IsGroupChat(hContact, szProto) || !g_plugin.getByte("MenuItem", 1)) {
 		Menu_ShowItem(hmenuitem, false);
 		return 0;
 	}
diff --git a/plugins/SeenPlugin/src/userinfo.cpp b/plugins/SeenPlugin/src/userinfo.cpp
index fce8288f05..adbe29c85c 100644
--- a/plugins/SeenPlugin/src/userinfo.cpp
+++ b/plugins/SeenPlugin/src/userinfo.cpp
@@ -63,7 +63,7 @@ struct UserinfoDlg : public CUserInfoPageDlg
 int UserinfoInit(WPARAM wparam, LPARAM hContact)
 {
 	char *szProto = Proto_GetBaseAccountName(hContact);
-	if (IsWatchedProtocol(szProto) && !Contact_IsGroupChat(hContact, szProto)) {
+	if (IsWatchedProtocol(szProto) && !Contact::IsGroupChat(hContact, szProto)) {
 		USERINFOPAGE uip = {};
 		uip.szTitle.a = LPGEN("Last seen");
 		uip.pDialog = new UserinfoDlg();
diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp
index 1a3bee9e55..7897bec510 100644
--- a/plugins/SeenPlugin/src/utils.cpp
+++ b/plugins/SeenPlugin/src/utils.cpp
@@ -218,7 +218,7 @@ LBL_noData:
 			break;
 
 		case 'N':
-			if (info = Contact_GetInfo(CNF_NICK, hcontact, szProto)) {
+			if (info = Contact::GetInfo(CNF_NICK, hcontact, szProto)) {
 				res.Append(info);
 				break;
 			}
@@ -233,7 +233,7 @@ LBL_noData:
 			break;
 
 		case 'u':
-			if (info = Contact_GetInfo(CNF_UNIQUEID, hcontact, szProto)) {
+			if (info = Contact::GetInfo(CNF_UNIQUEID, hcontact, szProto)) {
 				res.Append(info);
 				break;
 			}
@@ -407,7 +407,7 @@ void ShowPopup(MCONTACT hcontact, const char * lpzProto, int newStatus)
 	if (Ignore_IsIgnored(hcontact, IGNOREEVENT_USERONLINE))
 		return;
 
-	if (!g_plugin.bUsePopups || Contact_IsHidden(hcontact))
+	if (!g_plugin.bUsePopups || Contact::IsHidden(hcontact))
 		return;
 
 	char szSetting[10];
@@ -555,7 +555,7 @@ int UpdateValues(WPARAM hContact, LPARAM lparam)
 			g_plugin.setByte(hContact, "Offline", 0);
 		}
 	}
-	else if (hContact && IsWatchedProtocol(cws->szModule) && !Contact_IsGroupChat(hContact, cws->szModule)) {
+	else if (hContact && IsWatchedProtocol(cws->szModule) && !Contact::IsGroupChat(hContact, cws->szModule)) {
 		// here we will come when <User>/<module>/Status is changed or it is idle event and if <module> is watched
 		if (Proto_GetStatus(cws->szModule) > ID_STATUS_OFFLINE) {
 			mir_cslock lck(csContacts);
-- 
cgit v1.2.3