summaryrefslogtreecommitdiff
path: root/protocols/JabberG
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2021-12-26 15:13:30 +0300
committerGeorge Hazan <ghazan@miranda.im>2021-12-26 15:13:30 +0300
commitd7e53c4d5a748d5ef8c934e90dc59ff23c667420 (patch)
tree2b0c16de953e182321a0314b6ce3b909f428731f /protocols/JabberG
parent129687d805025b4e292174ffb3d224a55baf24d2 (diff)
WCHAR -> wchar_t
Diffstat (limited to 'protocols/JabberG')
-rw-r--r--protocols/JabberG/src/jabber_console.cpp6
-rw-r--r--protocols/JabberG/src/jabber_disco.h2
-rw-r--r--protocols/JabberG/src/jabber_svc.cpp2
3 files changed, 5 insertions, 5 deletions
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"");