From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jul 2016 09:20:25 +0000 Subject: less TCHARs: - TCHAR is replaced with wchar_t everywhere; - LPGENT replaced with either LPGENW or LPGEN; - fixes for ANSI plugins that improperly used _t functions; - TCHAR *t removed from MAllStrings; - ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz* git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/VKontakte/src/vk_struct.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'protocols/VKontakte/src/vk_struct.cpp') diff --git a/protocols/VKontakte/src/vk_struct.cpp b/protocols/VKontakte/src/vk_struct.cpp index ad7ff94525..a1d074a9ad 100644 --- a/protocols/VKontakte/src/vk_struct.cpp +++ b/protocols/VKontakte/src/vk_struct.cpp @@ -98,7 +98,7 @@ void AsyncHttpRequest::Redirect(NETLIBHTTPREQUEST *nhr) ///////////////////////////////////////////////////////////////////////////////////////// -CVkFileUploadParam::CVkFileUploadParam(MCONTACT _hContact, const TCHAR *_desc, TCHAR **_files) : +CVkFileUploadParam::CVkFileUploadParam(MCONTACT _hContact, const wchar_t *_desc, wchar_t **_files) : hContact(_hContact), Desc(mir_tstrdup(_desc)), FileName(mir_tstrdup(_files[0])), @@ -125,11 +125,11 @@ CVkFileUploadParam::VKFileType CVkFileUploadParam::GetType() if (fname) mir_free(fname); - TCHAR img[] = L".jpg .jpeg .png .bmp"; - TCHAR audio[] = L".mp3"; + wchar_t img[] = L".jpg .jpeg .png .bmp"; + wchar_t audio[] = L".mp3"; - TCHAR DRIVE[3], DIR[256], FNAME[256], EXT[256]; - _tsplitpath(FileName, DRIVE, DIR, FNAME, EXT); + wchar_t DRIVE[3], DIR[256], FNAME[256], EXT[256]; + _wsplitpath(FileName, DRIVE, DIR, FNAME, EXT); T2Utf pszFNAME(FNAME), pszEXT(EXT); CMStringA fn(FORMAT, "%s%s", pszFNAME, pszEXT); @@ -155,7 +155,7 @@ CVkFileUploadParam::VKFileType CVkFileUploadParam::GetType() CVkChatUser* CVkChatInfo::GetUserById(LPCTSTR ptszId) { - int user_id = _ttoi(ptszId); + int user_id = _wtoi(ptszId); return m_users.find((CVkChatUser*)&user_id); } -- cgit v1.2.3