From 500dd4848842f6d4207584417448586d060fbd6a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 31 Jul 2022 18:07:27 +0300 Subject: Contact: group of functions gathered into the personal namespace --- plugins/SecureIM/src/crypt_check.cpp | 8 ++++---- plugins/SecureIM/src/crypt_lists.cpp | 2 +- plugins/SecureIM/src/options.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/SecureIM/src') diff --git a/plugins/SecureIM/src/crypt_check.cpp b/plugins/SecureIM/src/crypt_check.cpp index f0665d7e28..7990de8f99 100644 --- a/plugins/SecureIM/src/crypt_check.cpp +++ b/plugins/SecureIM/src/crypt_check.cpp @@ -96,7 +96,7 @@ bool isProtoSmallPackets(MCONTACT hContact) bool isContactInvisible(MCONTACT hContact) { - if (!db_mc_isSub(hContact) && Contact_IsHidden(hContact)) + if (!db_mc_isSub(hContact) && Contact::IsHidden(hContact)) return true; pUinKey p = findUinKey(hContact); @@ -116,7 +116,7 @@ bool isContactInvisible(MCONTACT hContact) bool isNotOnList(MCONTACT hContact) { - return !Contact_OnList(hContact); + return !Contact::OnList(hContact); } bool isContactNewPG(MCONTACT hContact) @@ -180,7 +180,7 @@ bool isChatRoom(MCONTACT hContact) if (!p || !p->proto || !p->proto->inspecting) return false; - return Contact_IsGroupChat(hContact, p->proto->name); + return Contact::IsGroupChat(hContact, p->proto->name); } bool isFileExist(LPCSTR filename) @@ -193,7 +193,7 @@ bool isSecureIM(pUinKey ptr, BOOL emptyMirverAsSecureIM) if (!bAIP) return false; if (!ptr->proto->inspecting) return false; - if (bNOL && !Contact_OnList(ptr->hContact)) + if (bNOL && !Contact::OnList(ptr->hContact)) return false; bool isSecureIM = false; diff --git a/plugins/SecureIM/src/crypt_lists.cpp b/plugins/SecureIM/src/crypt_lists.cpp index 621101ee50..ef35cef91c 100644 --- a/plugins/SecureIM/src/crypt_lists.cpp +++ b/plugins/SecureIM/src/crypt_lists.cpp @@ -203,6 +203,6 @@ void getContactUin(MCONTACT hContact, LPWSTR szUIN) if (pa == nullptr) return; - ptrW uid(Contact_GetInfo(CNF_UNIQUEID, hContact, pa->szModuleName)); + ptrW uid(Contact::GetInfo(CNF_UNIQUEID, hContact, pa->szModuleName)); mir_snwprintf(szUIN, NAMSIZE, L"%s [%s]", uid.get(), pa->tszAccountName); } diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index a4d6312d95..f2917aeeb3 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -434,7 +434,7 @@ static void ResetGeneralDlg(HWND hDlg) LV_SetItemText(hLV, itemNum, 1, pa->tszAccountName); - ptrW uid(Contact_GetInfo(CNF_UNIQUEID, hContact, pa->szModuleName)); + ptrW uid(Contact::GetInfo(CNF_UNIQUEID, hContact, pa->szModuleName)); LV_SetItemText(hLV, itemNum, 2, uid); setListViewMode(hLV, itemNum, ptr->tmode); @@ -505,7 +505,7 @@ static void RefreshGeneralDlg(HWND hDlg, BOOL iInit) LV_SetItemText(hLV, itemNum, 1, pa->tszAccountName); - ptrW uid(Contact_GetInfo(CNF_UNIQUEID, hContact, pa->szModuleName)); + ptrW uid(Contact::GetInfo(CNF_UNIQUEID, hContact, pa->szModuleName)); LV_SetItemText(hLV, itemNum, 2, uid); setListViewMode(hLV, itemNum, ptr->tmode); -- cgit v1.2.3