From d7e53c4d5a748d5ef8c934e90dc59ff23c667420 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Dec 2021 15:13:30 +0300 Subject: WCHAR -> wchar_t --- protocols/JabberG/src/jabber_console.cpp | 6 +++--- protocols/JabberG/src/jabber_disco.h | 2 +- protocols/JabberG/src/jabber_svc.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'protocols/JabberG') diff --git a/protocols/JabberG/src/jabber_console.cpp b/protocols/JabberG/src/jabber_console.cpp index 94a9fc9c95..31b44d4414 100644 --- a/protocols/JabberG/src/jabber_console.cpp +++ b/protocols/JabberG/src/jabber_console.cpp @@ -40,7 +40,7 @@ struct StringBuf }; static void sttAppendBufRaw(StringBuf *buf, const char *str); -static void sttAppendBufW(StringBuf *buf, const WCHAR *str); +static void sttAppendBufW(StringBuf *buf, const wchar_t *str); #define sttAppendBufT(a,b) (sttAppendBufW((a),(b))) static void sttEmptyBuf(StringBuf *buf); @@ -149,14 +149,14 @@ static void sttAppendBufRaw(StringBuf *buf, const char *str) buf->offset += length; } -static void sttAppendBufW(StringBuf *buf, const WCHAR *str) +static void sttAppendBufW(StringBuf *buf, const wchar_t *str) { char tmp[32]; if (!str) return; sttAppendBufRaw(buf, "{\\uc1 "); - for (const WCHAR *p = str; *p; ++p) { + for (const wchar_t *p = str; *p; ++p) { if ((*p == '\\') || (*p == '{') || (*p == '}')) { tmp[0] = '\\'; tmp[1] = (char)*p; diff --git a/protocols/JabberG/src/jabber_disco.h b/protocols/JabberG/src/jabber_disco.h index 4b8eb25715..9ea232b38c 100644 --- a/protocols/JabberG/src/jabber_disco.h +++ b/protocols/JabberG/src/jabber_disco.h @@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef _JABBER_DISCO_H_ #define _JABBER_DISCO_H_ -#define CHR_BULLET ((WCHAR)0x2022) +#define CHR_BULLET ((wchar_t)0x2022) // #define STR_BULLET L" \u2022 " #define JABBER_DISCO_RESULT_NOT_REQUESTED 0 diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp index 1ec3c80106..1197453440 100644 --- a/protocols/JabberG/src/jabber_svc.cpp +++ b/protocols/JabberG/src/jabber_svc.cpp @@ -288,7 +288,7 @@ INT_PTR __cdecl CJabberProto::JabberSetAvatar(WPARAM, LPARAM lParam) INT_PTR __cdecl CJabberProto::JabberSetNickname(WPARAM wParam, LPARAM lParam) { - wchar_t *nickname = (wParam & SMNN_UNICODE) ? mir_wstrdup((WCHAR*)lParam) : mir_a2u((char*)lParam); + wchar_t *nickname = (wParam & SMNN_UNICODE) ? mir_wstrdup((wchar_t*)lParam) : mir_a2u((char*)lParam); setWString("Nick", nickname); SetServerVcard(FALSE, L""); -- cgit v1.2.3