From 2f261839b60692e33d0e160344d0d636d49c90ba Mon Sep 17 00:00:00 2001 From: George Hazan 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/DbEditorPP/src/main.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/DbEditorPP/src/main.cpp') diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp index 442237c4f6..20026bb8bc 100644 --- a/plugins/DbEditorPP/src/main.cpp +++ b/plugins/DbEditorPP/src/main.cpp @@ -421,7 +421,7 @@ int GetContactName(MCONTACT hContact, const char *proto, wchar_t *value, int max return 0; if (!hContact) { - mir_tstrncpy(value, TranslateT("Settings"), maxlen); + mir_wstrncpy(value, TranslateT("Settings"), maxlen); return 1; } @@ -471,10 +471,10 @@ int GetContactName(MCONTACT hContact, const char *proto, wchar_t *value, int max if (szProto) { GetValue(hContact, szProto, "FirstName", name, _countof(name)); - int len = (int)mir_tstrlen(name); + int len = (int)mir_wstrlen(name); if (len + 2 < _countof(name)) { if (len) - mir_tstrncat(name, L" ", _countof(name)); + mir_wstrncat(name, L" ", _countof(name)); len++; GetValue(hContact, szProto, "LastName", &name[len], _countof(name) - len); } @@ -487,20 +487,20 @@ int GetContactName(MCONTACT hContact, const char *proto, wchar_t *value, int max } if (!name[0]) - mir_tstrncpy(name, TranslateT(""), _countof(name)); + mir_wstrncpy(name, TranslateT(""), _countof(name)); if (szProto && szProto[0]) { if (g_Order) - mir_sntprintf(value, maxlen, L"(%s) %s", _A2T(szProto), name); + mir_snwprintf(value, maxlen, L"(%s) %s", _A2T(szProto), name); else - mir_sntprintf(value, maxlen, L"%s (%s)", name, _A2T(szProto)); + mir_snwprintf(value, maxlen, L"%s (%s)", name, _A2T(szProto)); } - else mir_tstrncpy(value, name, maxlen); + else mir_wstrncpy(value, name, maxlen); PROTOACCOUNT *pa = Proto_GetAccount(szProto); if (!Proto_IsAccountEnabled(pa)) { - mir_tstrncat(value, L" ", maxlen); - mir_tstrncat(value, TranslateT("[UNLOADED]"), maxlen); + mir_wstrncat(value, L" ", maxlen); + mir_wstrncat(value, TranslateT("[UNLOADED]"), maxlen); } return 1; @@ -560,6 +560,6 @@ INT_PTR CALLBACK ColumnsCompare(LPARAM lParam1, LPARAM lParam2, LPARAM myParam) ListView_GetItemText(params.hList, lParam1, params.column, text1, _countof(text1)); ListView_GetItemText(params.hList, lParam2, params.column, text2, _countof(text2)); - int res = mir_tstrcmpi(text1, text2); + int res = mir_wstrcmpi(text1, text2); return (params.column == params.last) ? -res : res; } -- cgit v1.2.3