From 2f261839b60692e33d0e160344d0d636d49c90ba Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 27 Jul 2016 14:23:31 +0000
Subject: less TCHARs

git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/ContactsPlus/src/utils.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/ContactsPlus/src/utils.cpp')

diff --git a/plugins/ContactsPlus/src/utils.cpp b/plugins/ContactsPlus/src/utils.cpp
index f16a559fe2..0cb84a1642 100644
--- a/plugins/ContactsPlus/src/utils.cpp
+++ b/plugins/ContactsPlus/src/utils.cpp
@@ -69,17 +69,17 @@ wchar_t* GetContactUID(MCONTACT hContact)
 	if (vrUid.type == DBVT_DWORD) {
 		wchar_t tmp[100];
 		_itow(vrUid.dVal, tmp, 10);
-		return mir_tstrdup(tmp);
+		return mir_wstrdup(tmp);
 	}
 
 	if (vrUid.type == DBVT_ASCIIZ) {
-		wchar_t *res = mir_a2t(vrUid.pszVal);
+		wchar_t *res = mir_a2u(vrUid.pszVal);
 		mir_free(vrUid.pszVal);
 		return res;
 	}
 
 	if (vrUid.type == DBVT_UTF8) {
-		wchar_t *res = mir_utf8decodeT(vrUid.pszVal);
+		wchar_t *res = mir_utf8decodeW(vrUid.pszVal);
 		mir_free(vrUid.pszVal);
 		return res;
 	}
@@ -115,22 +115,22 @@ void DrawProtocolIcon(HWND hwndDlg, LPARAM lParam, MCONTACT hContact)
 void UpdateDialogTitle(HWND hwndDlg, MCONTACT hContact, wchar_t *pszTitleStart)
 {
 	wchar_t newtitle[512];
-	mir_tstrncpy(newtitle, TranslateTS(pszTitleStart), _countof(newtitle));
+	mir_wstrncpy(newtitle, TranslateTS(pszTitleStart), _countof(newtitle));
 	
 	if (hContact) {
 		char *szProto = GetContactProto(hContact);
 		if (szProto) {
-			ptrT uid(GetContactUID(hContact));
+			ptrW uid(GetContactUID(hContact));
 			wchar_t *contactName = pcli->pfnGetContactDisplayName(hContact, 0);
 
 			wchar_t oldTitle[MAX_PATH];
 			GetDlgItemText(hwndDlg, IDC_NAME, oldTitle, _countof(oldTitle));
 
-			if (mir_tstrcmp(uid ? uid : contactName, oldTitle))
+			if (mir_wstrcmp(uid ? uid : contactName, oldTitle))
 				SetDlgItemText(hwndDlg, IDC_NAME, uid ? uid : contactName);
 
 			wchar_t *szStatus = pcli->pfnGetStatusModeDescription(db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);
-			mir_sntprintf(newtitle, L"%s %s (%s)", TranslateTS(pszTitleStart), contactName, szStatus);
+			mir_snwprintf(newtitle, L"%s %s (%s)", TranslateTS(pszTitleStart), contactName, szStatus);
 		}
 	}
 
-- 
cgit v1.2.3