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/Msg_Export/src/options.cpp | 2 +- plugins/Msg_Export/src/utils.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/Msg_Export') diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp index 90f87f8067..4e9a815831 100644 --- a/plugins/Msg_Export/src/options.cpp +++ b/plugins/Msg_Export/src/options.cpp @@ -475,7 +475,7 @@ public: sItem.pszText = pa->tszAccountName; listUsers.SetItem(&sItem); - ptrW wszUin(Contact_GetInfo(CNF_UNIQUEID, hContact, pa->szModuleName)); + ptrW wszUin(Contact::GetInfo(CNF_UNIQUEID, hContact, pa->szModuleName)); if (wszUin) { sItem.iSubItem = 3; sItem.pszText = wszUin; diff --git a/plugins/Msg_Export/src/utils.cpp b/plugins/Msg_Export/src/utils.cpp index 7a67870ed2..75c751a47c 100644 --- a/plugins/Msg_Export/src/utils.cpp +++ b/plugins/Msg_Export/src/utils.cpp @@ -448,7 +448,7 @@ void ReplaceAllNoColon(wstring &sSrc, const wchar_t *pszReplace, wstring &sNew) static wstring GetUniqueId(MCONTACT hContact, const char *szProto) { - ptrW uniqueId(Contact_GetInfo(CNF_UNIQUEID, hContact, szProto)); + ptrW uniqueId(Contact::GetInfo(CNF_UNIQUEID, hContact, szProto)); return (uniqueId == nullptr) ? L"(null)" : uniqueId; } @@ -688,7 +688,7 @@ static bool ExportDBEventInfo(MCONTACT hContact, HANDLE hFile, const wstring &sF pInfo.push_back(JSONNode("user", T2Utf(sRemoteUser.c_str()).get())); pInfo.push_back(JSONNode("proto", szProto)); - ptrW id(Contact_GetInfo(CNF_UNIQUEID, hContact, szProto)); + ptrW id(Contact::GetInfo(CNF_UNIQUEID, hContact, szProto)); if (id != NULL) pInfo.push_back(JSONNode("uin", T2Utf(id).get())); @@ -732,7 +732,7 @@ static bool ExportDBEventInfo(MCONTACT hContact, HANDLE hFile, const wstring &sF output.AppendFormat(L"%-10s: %s\r\n", TranslateT("User"), sRemoteUser.c_str()); output.AppendFormat(L"%-10s: %S\r\n", TranslateT("Account"), szProto); - ptrW id(Contact_GetInfo(CNF_UNIQUEID, hContact, szProto)); + ptrW id(Contact::GetInfo(CNF_UNIQUEID, hContact, szProto)); if (id != NULL) output.AppendFormat(L"%-10s: %s\r\n", TranslateT("User ID"), id.get()); @@ -1112,6 +1112,6 @@ int nContactDeleted(WPARAM hContact, LPARAM) wchar_t* GetMyOwnNick(MCONTACT hContact) { - wchar_t *p = Contact_GetInfo(CNF_DISPLAY, NULL, Proto_GetBaseAccountName(hContact)); + wchar_t *p = Contact::GetInfo(CNF_DISPLAY, NULL, Proto_GetBaseAccountName(hContact)); return (p != nullptr) ? p : mir_wstrdup(TranslateT("No_Nick")); } -- cgit v1.2.3