Contact: group of functions gathered into the personal namespace

10 files changed, 18 insertions, 18 deletions

diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp
index ec4b8541fa..173fad2b7f 100644
--- a/plugins/TabSRMM/src/chat_tools.cpp
+++ b/plugins/TabSRMM/src/chat_tools.cpp
@@ -216,8 +216,8 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight
 

 	if (bHighlight) {

 		gce->iType |= GC_EVENT_HIGHLIGHT;

-		if (Contact_IsHidden(si->hContact) != 0)

-			Contact_Hide(si->hContact, false);

+		if (Contact::IsHidden(si->hContact) != 0)

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

 		

 		if (bInactive) {

 			bFlagUnread = true;

diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp
index 6e8a373d55..88b06217ca 100644
--- a/plugins/TabSRMM/src/contactcache.cpp
+++ b/plugins/TabSRMM/src/contactcache.cpp
@@ -158,7 +158,7 @@ bool CContactCache::updateUIN()
 	m_szUIN[0] = 0;
 
 	if (m_isValid) {
-		ptrW uid(Contact_GetInfo(CNF_DISPLAYUID, getActiveContact(), getActiveProto()));
+		ptrW uid(Contact::GetInfo(CNF_DISPLAYUID, getActiveContact(), getActiveProto()));
 		if (uid != nullptr)
 			wcsncpy_s(m_szUIN, uid, _TRUNCATE);
 	}
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index b95734d3af..48f4cb34a7 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -833,7 +833,7 @@ void CMsgDialog::DM_NotifyTyping(int mode)
 
 		// don't send to contacts which are not permanently added to the contact list,
 		// unless the option to ignore added status is set.
-		if (!Contact_OnList(m_hContact) && !g_plugin.bTypingUnknown)
+		if (!Contact::OnList(m_hContact) && !g_plugin.bTypingUnknown)
 			return;
 
 		// End user check
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 679fb63f7b..dcf827104c 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -502,7 +502,7 @@ void CGlobals::logStatusChange(WPARAM wParam, const CContactCache *c)
 		return;

 

 	// don't log them if WE are logging off

-	if (Proto_GetStatus(c->getProto()) == ID_STATUS_OFFLINE || Contact_IsGroupChat(hContact, c->getProto()))

+	if (Proto_GetStatus(c->getProto()) == ID_STATUS_OFFLINE || Contact::IsGroupChat(hContact, c->getProto()))

 		return;

 

 	uint16_t wStatus = LOWORD(wParam);

diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index 82430e9446..2cc217774a 100644
--- a/plugins/TabSRMM/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
@@ -249,7 +249,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 						SendMessage(pDlg->GetHwnd(), WM_CLOSE, 0, 1);

 

 					char *szProto = Proto_GetBaseAccountName(lParam);

-					if (szProto != nullptr && Contact_IsGroupChat(lParam, szProto))

+					if (szProto != nullptr && Contact::IsGroupChat(lParam, szProto))

 						ShowRoom((TContainerData*)wParam, SM_FindSessionByHCONTACT(lParam));

 					else

 						CreateNewTabForContact((TContainerData*)wParam, lParam, true, true, false);

diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index e6957fbd0a..01a02eaf28 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -351,7 +351,7 @@ int CMimAPI::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;
 	}
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 9533808d2b..7d594156d8 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -111,7 +111,7 @@ static void ShowMultipleControls(HWND hwndDlg, const UINT *controls, int cContro
 

 void CMsgDialog::SetDialogToType()

 {

-	if (!Contact_OnList(m_hContact)) {

+	if (!Contact::OnList(m_hContact)) {

 		m_bNotOnList = true;

 		ShowMultipleControls(m_hwnd, addControls, _countof(addControls), SW_SHOW);

 		Utils::showDlgControl(m_hwnd, IDC_LOGFROZENTEXT, SW_SHOW);

@@ -677,7 +677,7 @@ void CMsgDialog::OnDestroy()
 		m_pContainer->m_pSideBar->removeSession(this);

 

 	if (M.GetByte("deletetemp", 0))

-		if (!Contact_OnList(m_hContact))

+		if (!Contact::OnList(m_hContact))

 			db_delete_contact(m_hContact);

 

 	if (m_hwndContactPic)

@@ -890,9 +890,9 @@ void CMsgDialog::onClick_Ok(CCtrlButton *)
 

 void CMsgDialog::onClick_Add(CCtrlButton*)

 {

-	Contact_Add(m_hContact, m_hwnd);

+	Contact::Add(m_hContact, m_hwnd);

 

-	if (Contact_OnList(m_hContact)) {

+	if (Contact::OnList(m_hContact)) {

 		m_bNotOnList = false;

 		ShowMultipleControls(m_hwnd, addControls, _countof(addControls), SW_HIDE);

 		if (!m_bScrollingDisabled)

diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index 0950593edb..fca323a908 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -672,9 +672,9 @@ HICON CMsgDialog::GetMyContactIcon(LPCSTR szSetting)
 
 void CMsgDialog::GetMyNick()
 {
-	ptrW tszNick(Contact_GetInfo(CNF_CUSTOMNICK, 0, m_cache->getActiveProto()));
+	ptrW tszNick(Contact::GetInfo(CNF_CUSTOMNICK, 0, m_cache->getActiveProto()));
 	if (tszNick == nullptr)
-		tszNick = Contact_GetInfo(CNF_NICK, 0, m_cache->getActiveProto());
+		tszNick = Contact::GetInfo(CNF_NICK, 0, m_cache->getActiveProto());
 	if (tszNick != nullptr) {
 		if (mir_wstrlen(tszNick) == 0 || !mir_wstrcmp(tszNick, TranslateT("'(Unknown contact)'")))
 			wcsncpy_s(m_wszMyNickname, (m_myUin[0] ? m_myUin : TranslateT("'(Unknown contact)'")), _TRUNCATE);
@@ -690,7 +690,7 @@ void CMsgDialog::GetMyNick()
 
 void CMsgDialog::GetMYUIN()
 {
-	ptrW uid(Contact_GetInfo(CNF_DISPLAYUID, 0, m_cache->getActiveProto()));
+	ptrW uid(Contact::GetInfo(CNF_DISPLAYUID, 0, m_cache->getActiveProto()));
 	if (uid != nullptr)
 		wcsncpy_s(m_myUin, uid, _TRUNCATE);
 	else
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index fbc7f439db..44c18bf777 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -580,8 +580,8 @@ public:
 

 		m_hContact = db_add_contact();

 		Proto_AddToContact(m_hContact, m_szProto = META_PROTO);

-		Contact_Hide(m_hContact);

-		Contact_RemoveFromList(m_hContact);

+		Contact::Hide(m_hContact);

+		Contact::RemoveFromList(m_hContact);

 		db_set_ws(m_hContact, META_PROTO, "Nick", TranslateT("Test contact"));

 

 		m_pContainer = new TContainerData();

diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp
index 02f741c5e9..45b3a28d78 100644
--- a/plugins/TabSRMM/src/typingnotify.cpp
+++ b/plugins/TabSRMM/src/typingnotify.cpp
@@ -64,10 +64,10 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA
 void TN_TypingMessage(MCONTACT hContact, int iMode)

 {

 	// hidden & ignored contacts check

-	if (Contact_IsHidden(hContact) || (db_get_dw(hContact, "Ignore", "Mask1", 0) & 1)) // 9 - online notification

+	if (Contact::IsHidden(hContact) || (db_get_dw(hContact, "Ignore", "Mask1", 0) & 1)) // 9 - online notification

 		return;

 

-	if (!Contact_OnList(hContact) && !g_plugin.bTypingUnknown)

+	if (!Contact::OnList(hContact) && !g_plugin.bTypingUnknown)

 		return;

 

 	if (!g_plugin.bPopups)