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

---
 src/core/stdmsg/src/msgdialog.cpp | 12 ++++++------
 src/core/stdmsg/src/msglog.cpp    |  4 ++--
 src/core/stdmsg/src/msgs.cpp      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/core/stdmsg')

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 8578ea4b2b..b05f576411 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -290,7 +290,7 @@ void CMsgDialog::OnDestroy()
 
 	// a temporary contact should be destroyed after removing window from the window list to prevent recursion
 	if (m_hContact && g_plugin.bDeleteTempCont)
-		if (!Contact_OnList(m_hContact))
+		if (!Contact::OnList(m_hContact))
 			db_delete_contact(m_hContact);
 }
 
@@ -771,7 +771,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 		switch (LOWORD(wParam)) {
 		case IDC_USERMENU:
 			if (GetKeyState(VK_SHIFT) & 0x8000) {    // copy user name
-				ptrW id(Contact_GetInfo(CNF_UNIQUEID, m_hContact, m_szProto));
+				ptrW id(Contact::GetInfo(CNF_UNIQUEID, m_hContact, m_szProto));
 				if (id != nullptr && OpenClipboard(m_hwnd)) {
 					HGLOBAL hData = GlobalAlloc(GMEM_MOVEABLE, mir_wstrlen(id) * sizeof(wchar_t) + 1);
 					if (hData) {
@@ -796,9 +796,9 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 			break;
 
 		case IDC_ADD:
-			Contact_Add(m_hContact, m_hwnd);
+			Contact::Add(m_hContact, m_hwnd);
 
-			if (Contact_OnList(m_hContact))
+			if (Contact::OnList(m_hContact))
 				ShowWindow(GetDlgItem(m_hwnd, IDC_ADD), FALSE);
 			break;
 		}
@@ -1262,7 +1262,7 @@ void CMsgDialog::OnOptionsApplied(bool bUpdateAvatar)
 		bool bShow = false;
 		if (m_hContact && g_plugin.bShowButtons) {
 			if (cbd->m_dwButtonCID == IDC_ADD) {
-				bShow = !Contact_OnList(m_hContact);
+				bShow = !Contact::OnList(m_hContact);
 				cbd->m_bHidden = !bShow;
 			}
 			else bShow = true;
@@ -1395,7 +1395,7 @@ void CMsgDialog::NotifyTyping(int mode)
 		if (protoCaps & PF1_INVISLIST && protoStatus == ID_STATUS_INVISIBLE && db_get_w(m_hContact, m_szProto, "ApparentMode", 0) != ID_STATUS_ONLINE)
 			return;
 
-		if (!g_plugin.bTypingUnknown && !Contact_OnList(m_hContact))
+		if (!g_plugin.bTypingUnknown && !Contact::OnList(m_hContact))
 			return;
 
 		// End user check
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index 228ec4ea53..8fb1f5edbd 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -265,7 +265,7 @@ static bool CreateRTFFromDbEvent(LogStreamData *dat)
 		wchar_t *szName;
 
 		if (dbei.flags & DBEF_SENT) {
-			if (wchar_t *p = Contact_GetInfo(CNF_DISPLAY, 0, dbei.szModule))
+			if (wchar_t *p = Contact::GetInfo(CNF_DISPLAY, 0, dbei.szModule))
 				szName = NEWWSTR_ALLOCA(p);
 			else
 				szName = TranslateT("Me");
@@ -285,7 +285,7 @@ static bool CreateRTFFromDbEvent(LogStreamData *dat)
 	case EVENTTYPE_JABBER_CHATSTATES:
 	case EVENTTYPE_JABBER_PRESENCE:
 		if (dbei.flags & DBEF_SENT) {
-			if (wchar_t *p = Contact_GetInfo(CNF_DISPLAY, 0, dbei.szModule)) {
+			if (wchar_t *p = Contact::GetInfo(CNF_DISPLAY, 0, dbei.szModule)) {
 				szName = NEWWSTR_ALLOCA(p);
 				mir_free(p);
 			}
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index a0fb9d874f..95b209fd02 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -488,7 +488,7 @@ static int PrebuildContactMenu(WPARAM hContact, LPARAM)
 		char *szProto = Proto_GetBaseAccountName(hContact);
 		if (szProto) {
 			// leave this menu item hidden for chats
-			if (!Contact_IsGroupChat(hContact, szProto))
+			if (!Contact::IsGroupChat(hContact, szProto))
 				if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IMSEND)
 					bEnabled = true;
 		}
-- 
cgit v1.2.3