summaryrefslogtreecommitdiff
path: root/src/core/stdfile
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-07-20 13:25:21 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-07-20 13:25:21 +0300
commit509fbd91ed545d05cc266a80ec19fe7b9c9d28db (patch)
tree09c2d97d212c0820f6d5e85d7e583b8a56b26ef8 /src/core/stdfile
parentc90b4443c10b08eeae9466428255fe8ff7b48d6d (diff)
we don't need two name sets for the same array of functions
Diffstat (limited to 'src/core/stdfile')
-rw-r--r--src/core/stdfile/src/file.cpp4
-rw-r--r--src/core/stdfile/src/filexferdlg.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp
index c9f15ef1d5..7f99a783c0 100644
--- a/src/core/stdfile/src/file.cpp
+++ b/src/core/stdfile/src/file.cpp
@@ -372,9 +372,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] = Utf8EncodeW(pre->files.w[i]);
+ pszFiles[i] = mir_utf8encodeW(pre->files.w[i]);
- szDescr = Utf8EncodeW(pre->descr.w);
+ szDescr = mir_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 f5227c6f79..841d2d0c2c 100644
--- a/src/core/stdfile/src/filexferdlg.cpp
+++ b/src/core/stdfile/src/filexferdlg.cpp
@@ -45,7 +45,7 @@ struct virusscanthreadstartinfo {
wchar_t* PFTS_StringToTchar(int flags, const wchar_t* s)
{
if (flags & PFTS_UTF)
- return Utf8DecodeW((char*)s);
+ return mir_utf8decodeW((char*)s);
if (flags & PFTS_UNICODE)
return mir_wstrdup(s);
return mir_a2u((char*)s);
@@ -54,7 +54,7 @@ wchar_t* PFTS_StringToTchar(int flags, const wchar_t* s)
int PFTS_CompareWithTchar(PROTOFILETRANSFERSTATUS *ft, const wchar_t *s, wchar_t *r)
{
if (ft->flags & PFTS_UTF) {
- wchar_t *ts = Utf8DecodeW((char*)s);
+ wchar_t *ts = mir_utf8decodeW((char*)s);
int res = mir_wstrcmp(ts, r);
mir_free(ts);
return res;
@@ -79,7 +79,7 @@ void FillSendData(FileDlgData *dat, DBEVENTINFO& dbei)
dbei.eventType = EVENTTYPE_FILE;
dbei.flags = DBEF_SENT;
dbei.timestamp = time(0);
- char *szFileNames = Utf8EncodeW(dat->szFilenames), *szMsg = Utf8EncodeW(dat->szMsg);
+ char *szFileNames = mir_utf8encodeW(dat->szFilenames), *szMsg = mir_utf8encodeW(dat->szMsg);
dbei.flags |= DBEF_UTF;
dbei.cbBlob = int(sizeof(DWORD) + mir_strlen(szFileNames) + mir_strlen(szMsg) + 2);