From df51f338983ba85feffcbd2209100c6927dda8a5 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 16 Jan 2017 18:19:15 +0300 Subject: Utf8DecodeT/Utf8EncodeT macros considered useless and replaced with Utf8DecodeW/Utf8EncodeW --- src/core/stdfile/src/file.cpp | 4 ++-- src/core/stdfile/src/filexferdlg.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/stdfile') diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp index d07d8b3ee8..7bb233df4f 100644 --- a/src/core/stdfile/src/file.cpp +++ b/src/core/stdfile/src/file.cpp @@ -373,9 +373,9 @@ static INT_PTR Proto_RecvFileT(WPARAM, LPARAM lParam) if (bUnicode) { pszFiles = (char**)alloca(pre->fileCount * sizeof(char*)); for (int i = 0; i < pre->fileCount; i++) - pszFiles[i] = Utf8EncodeT(pre->files.w[i]); + pszFiles[i] = Utf8EncodeW(pre->files.w[i]); - szDescr = Utf8EncodeT(pre->descr.w); + szDescr = Utf8EncodeW(pre->descr.w); } else { pszFiles = pre->files.a; diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp index bf8088ab0c..9427d258b2 100644 --- a/src/core/stdfile/src/filexferdlg.cpp +++ b/src/core/stdfile/src/filexferdlg.cpp @@ -80,7 +80,7 @@ void FillSendData(FileDlgData *dat, DBEVENTINFO& dbei) dbei.eventType = EVENTTYPE_FILE; dbei.flags = DBEF_SENT; dbei.timestamp = time(NULL); - char *szFileNames = Utf8EncodeT(dat->szFilenames), *szMsg = Utf8EncodeT(dat->szMsg); + char *szFileNames = Utf8EncodeW(dat->szFilenames), *szMsg = Utf8EncodeW(dat->szMsg); dbei.flags |= DBEF_UTF; dbei.cbBlob = int(sizeof(DWORD) + mir_strlen(szFileNames) + mir_strlen(szMsg) + 2); -- cgit v1.2.3