From f18d37c4c90bc39f295fea9fedbfae0e806d9f61 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 7 Feb 2017 00:24:03 +0300 Subject: rest of ANSI macros removed --- protocols/IcqOscarJ/src/utilities.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'protocols/IcqOscarJ/src/utilities.cpp') diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp index 85ef2b029d..5f0a2d6bb7 100644 --- a/protocols/IcqOscarJ/src/utilities.cpp +++ b/protocols/IcqOscarJ/src/utilities.cpp @@ -207,7 +207,7 @@ int MirandaStatusToSupported(int nMirandaStatus) char* MirandaStatusToStringUtf(int mirandaStatus) { // return miranda status description in utf-8, use unicode service is possible - return tchar_to_utf8(pcli->pfnGetStatusModeDescription(mirandaStatus, 0)); + return make_utf8_string(pcli->pfnGetStatusModeDescription(mirandaStatus, 0)); } char** CIcqProto::MirandaStatusToAwayMsg(int nStatus) @@ -570,7 +570,7 @@ char* NickFromHandleUtf(MCONTACT hContact) if (hContact == INVALID_CONTACT_ID) return ICQTranslateUtf(LPGEN("")); - return tchar_to_utf8(pcli->pfnGetContactDisplayName(hContact, 0)); + return make_utf8_string(pcli->pfnGetContactDisplayName(hContact, 0)); } char* strUID(DWORD dwUIN, char *pszUID) @@ -1556,7 +1556,7 @@ int FileAccessUtf(const char *path, int mode) size_t size = mir_strlen(path) + 2; wchar_t *szPath = (wchar_t*)_alloca(size * sizeof(wchar_t)); - if (utf8_to_tchar_static(path, szPath, size)) + if (make_unicode_string_static(path, szPath, size)) return _waccess(szPath, mode); return -1; @@ -1568,7 +1568,7 @@ int FileStatUtf(const char *path, struct _stati64 *buffer) size_t size = mir_strlen(path) + 2; wchar_t *szPath = (wchar_t*)_alloca(size * sizeof(wchar_t)); - if (utf8_to_tchar_static(path, szPath, size)) + if (make_unicode_string_static(path, szPath, size)) return _wstat64(szPath, buffer); return -1; @@ -1581,7 +1581,7 @@ int MakeDirUtf(const char *dir) size_t size = mir_strlen(dir) + 2; wchar_t *szDir = (wchar_t*)_alloca(size * sizeof(wchar_t)); - if (utf8_to_tchar_static(dir, szDir, size)) { // _wmkdir can created only one dir at once + if (make_unicode_string_static(dir, szDir, size)) { // _wmkdir can created only one dir at once wRes = _wmkdir(szDir); // check if dir not already existed - return success if yes if (wRes == -1 && errno == 17 /* EEXIST */) @@ -1610,7 +1610,7 @@ int OpenFileUtf(const char *filename, int oflag, int pmode) size_t size = mir_strlen(filename) + 2; wchar_t *szFile = (wchar_t*)_alloca(size * sizeof(wchar_t)); - if (utf8_to_tchar_static(filename, szFile, size)) + if (make_unicode_string_static(filename, szFile, size)) return _wopen(szFile, oflag, pmode); return -1; @@ -1639,7 +1639,7 @@ char* GetWindowTextUtf(HWND hWnd) GetWindowText(hWnd, szText, nLen + 1); - return tchar_to_utf8(szText); + return make_utf8_string(szText); } @@ -1654,7 +1654,7 @@ void SetWindowTextUtf(HWND hWnd, const char *szText) size_t size = mir_strlen(szText) + 2; wchar_t *tszText = (wchar_t*)_alloca(size * sizeof(wchar_t)); - if (utf8_to_tchar_static(szText, tszText, size)) + if (make_unicode_string_static(szText, tszText, size)) SetWindowText(hWnd, tszText); } -- cgit v1.2.3