From 35e2289786a7f1542573d1a58ebc971970ea981c Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 5 Apr 2018 22:10:25 +0300
Subject: CLIST_INTERFACE::pfnGetContactDisplayName =>
 Clist_GetContactDisplayName

---
 plugins/SMS/src/SMS_svc.cpp | 2 +-
 plugins/SMS/src/options.cpp | 2 +-
 plugins/SMS/src/receive.cpp | 4 ++--
 plugins/SMS/src/recvdlg.cpp | 2 +-
 plugins/SMS/src/senddlg.cpp | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins/SMS/src')

diff --git a/plugins/SMS/src/SMS_svc.cpp b/plugins/SMS/src/SMS_svc.cpp
index 77c4b1c1e9..92542c268e 100644
--- a/plugins/SMS/src/SMS_svc.cpp
+++ b/plugins/SMS/src/SMS_svc.cpp
@@ -79,7 +79,7 @@ int SendSMSMenuCommand(WPARAM wParam, LPARAM)
 
 		for (auto &hContact : Contacts()) {
 			if (GetContactPhonesCount(hContact)) {
-				SendDlgItemMessage(hwndSendSms, IDC_NAME, CB_ADDSTRING, 0, (LPARAM)pcli->pfnGetContactDisplayName(hContact, 0));
+				SendDlgItemMessage(hwndSendSms, IDC_NAME, CB_ADDSTRING, 0, (LPARAM)Clist_GetContactDisplayName(hContact));
 				SendSMSWindowSMSContactAdd(hwndSendSms, hContact);
 			}
 		}
diff --git a/plugins/SMS/src/options.cpp b/plugins/SMS/src/options.cpp
index 38f51ea4d6..015929ec5f 100644
--- a/plugins/SMS/src/options.cpp
+++ b/plugins/SMS/src/options.cpp
@@ -38,7 +38,7 @@ INT_PTR CALLBACK DlgProcEditorOptions(HWND hWndDlg, UINT msg, WPARAM wParam, LPA
 		TranslateDialogDefault(hWndDlg);
 
 		if (DB_SMS_GetStaticStringW(NULL,"Signature",tszSign,_countof(tszSign),nullptr)==FALSE)
-			mir_snwprintf(tszSign, TranslateT("From %s:\r\n\r\n"), pcli->pfnGetContactDisplayName(0, 0));
+			mir_snwprintf(tszSign, TranslateT("From %s:\r\n\r\n"), Clist_GetContactDisplayName(0));
 
 		SetDlgItemText(hWndDlg,IDC_SIGNATURE,tszSign);
 		{
diff --git a/plugins/SMS/src/receive.cpp b/plugins/SMS/src/receive.cpp
index a0b41f4106..55c1a491b5 100644
--- a/plugins/SMS/src/receive.cpp
+++ b/plugins/SMS/src/receive.cpp
@@ -231,7 +231,7 @@ int handleNewMessage(WPARAM hContact, LPARAM hDbEvent)
 			}
 			else {
 				memcpy(pszServiceFunctionName, SMS_READ, sizeof(SMS_READ));
-				mir_snwprintf(szToolTip, TranslateT("SMS Message from %s"), pcli->pfnGetContactDisplayName(hContact, 0));
+				mir_snwprintf(szToolTip, TranslateT("SMS Message from %s"), Clist_GetContactDisplayName(hContact));
 
 				CLISTEVENT cle = {};
 				cle.flags = CLEF_UNICODE;
@@ -254,7 +254,7 @@ int handleNewMessage(WPARAM hContact, LPARAM hDbEvent)
 			UINT iIcon;
 			if (GetDataFromMessage((LPSTR)dbei.pBlob, dbei.cbBlob, nullptr, nullptr, 0, nullptr, &iIcon)) {
 				memcpy(pszServiceFunctionName, SMS_READ_ACK, sizeof(SMS_READ_ACK));
-				mir_snwprintf(szToolTip, TranslateT("SMS Confirmation from %s"), pcli->pfnGetContactDisplayName(hContact, 0));
+				mir_snwprintf(szToolTip, TranslateT("SMS Confirmation from %s"), Clist_GetContactDisplayName(hContact));
 
 				CLISTEVENT cle = {};
 				cle.flags = CLEF_UNICODE;
diff --git a/plugins/SMS/src/recvdlg.cpp b/plugins/SMS/src/recvdlg.cpp
index 5dd2df908c..1ec5d5bbc5 100644
--- a/plugins/SMS/src/recvdlg.cpp
+++ b/plugins/SMS/src/recvdlg.cpp
@@ -209,7 +209,7 @@ HWND RecvSMSWindowAdd(MCONTACT hContact, DWORD dwEventType, LPWSTR lpwszPhone, s
 				dwPhoneSize++;
 			}
 
-			lpwszContactDisplayName = pcli->pfnGetContactDisplayName(hContact, 0);
+			lpwszContactDisplayName = Clist_GetContactDisplayName(hContact);
 			mir_snwprintf(wszTitle, L"%s - %s", lpwszContactDisplayName, lpwszTitlepart);
 			MultiByteToWideChar(CP_UTF8, 0, lpszMessage, (int)dwMessageSize, lpwszMessage, (int)dwMessageSize + MAX_PATH);
 
diff --git a/plugins/SMS/src/senddlg.cpp b/plugins/SMS/src/senddlg.cpp
index 99d0012e80..db9051097e 100644
--- a/plugins/SMS/src/senddlg.cpp
+++ b/plugins/SMS/src/senddlg.cpp
@@ -557,7 +557,7 @@ HWND SendSMSWindowAdd(MCONTACT hContact)
 		ListMTItemAdd(&ssSMSSettings.lmtSendSMSWindowsListMT, &psswdWindowData->lmtListMTItem, psswdWindowData);
 		ListMTUnLock(&ssSMSSettings.lmtSendSMSWindowsListMT);
 
-		LPTSTR lptszContactDisplayName = pcli->pfnGetContactDisplayName(hContact, 0);
+		LPTSTR lptszContactDisplayName = Clist_GetContactDisplayName(hContact);
 		wchar_t tszTitle[MAX_PATH];
 		mir_snwprintf(tszTitle, L"%s - %s", lptszContactDisplayName, TranslateT("Send SMS"));
 		SetWindowText(psswdWindowData->hWnd, tszTitle);
@@ -1016,7 +1016,7 @@ void AddContactPhonesToTreeViewParam(MCONTACT hContact, LPSTR lpszModule, LPSTR
 		dwPhoneSize = CopyNumberW(tszPhone + 1, tszPhoneRaw, dwPhoneSize);
 		if (IsPhoneW(tszPhone, dwPhoneSize)) {
 			if (tvis.hParent == nullptr) {
-				tvis.item.pszText = pcli->pfnGetContactDisplayName(hContact, 0);
+				tvis.item.pszText = Clist_GetContactDisplayName(hContact);
 				tvis.hParent = TreeView_InsertItem(hWndList, &tvis);
 			}
 			tvis.item.pszText = tszPhone;
@@ -1031,7 +1031,7 @@ void AddContactPhonesToTreeViewParam(MCONTACT hContact, LPSTR lpszModule, LPSTR
 			dwPhoneSize = CopyNumberW(tszPhone + 1, tszPhoneRaw, dwPhoneSize);
 			if (IsPhoneW(tszPhone, dwPhoneSize)) {
 				if (tvis.hParent == nullptr) {
-					tvis.item.pszText = pcli->pfnGetContactDisplayName(hContact, 0);
+					tvis.item.pszText = Clist_GetContactDisplayName(hContact);
 					tvis.hParent = TreeView_InsertItem(hWndList, &tvis);
 				}
 				tvis.item.pszText = tszPhone;
-- 
cgit v1.2.3