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 --- plugins/UserInfoEx/src/ctrl_button.cpp | 2 +- plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp | 2 +- plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h | 2 +- plugins/UserInfoEx/src/mir_db.cpp | 2 +- plugins/UserInfoEx/src/svc_avatar.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/UserInfoEx/src') diff --git a/plugins/UserInfoEx/src/ctrl_button.cpp b/plugins/UserInfoEx/src/ctrl_button.cpp index 07ba971802..4db6ec100a 100644 --- a/plugins/UserInfoEx/src/ctrl_button.cpp +++ b/plugins/UserInfoEx/src/ctrl_button.cpp @@ -155,7 +155,7 @@ static void __fastcall PaintIcon(BTNCTRL *ctl, HDC hdcMem, LPWORD ccText, LPRECT static void __fastcall PaintThemeButton(BTNCTRL *ctl, HDC hdcMem, LPRECT rcClient) { RECT rcText = { 0, 0, 0, 0 }; - WCHAR wszText[MAX_PATH] = { 0 }; + wchar_t wszText[MAX_PATH] = { 0 }; WORD ccText; // Draw the flat button diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp index 6733e4940d..17cb4a180f 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp @@ -163,7 +163,7 @@ size_t CLineBuffer::operator + (const CHAR *szVal) * return: length of the string, added **/ -size_t CLineBuffer::operator + (const WCHAR *wszVal) +size_t CLineBuffer::operator + (const wchar_t *wszVal) { if (wszVal) { CHAR *szVal = mir_u2a(wszVal); diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h index 13822c3507..cea4cc9067 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h @@ -38,7 +38,7 @@ public: size_t operator=(const CHAR *szVal); size_t operator + (const CHAR *szVal); - size_t operator + (const WCHAR *wszVal); + size_t operator + (const wchar_t *wszVal); size_t operator + (const CHAR cVal); size_t operator + (const BYTE bVal); size_t operator + (const SHORT sVal); diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp index f237952e40..cb69877cfb 100644 --- a/plugins/UserInfoEx/src/mir_db.cpp +++ b/plugins/UserInfoEx/src/mir_db.cpp @@ -434,7 +434,7 @@ BYTE dbv2String(DBVARIANT* dbv, const BYTE destType) if (dbv == nullptr) return 1; - WCHAR wbuf[32]; + wchar_t wbuf[32]; CHAR buf[32]; switch (destType) { // destination type is "utf8" or "ascii" diff --git a/plugins/UserInfoEx/src/svc_avatar.cpp b/plugins/UserInfoEx/src/svc_avatar.cpp index 14a1d1c247..e8f80dd237 100644 --- a/plugins/UserInfoEx/src/svc_avatar.cpp +++ b/plugins/UserInfoEx/src/svc_avatar.cpp @@ -46,7 +46,7 @@ namespace NServices if (!mtb.DBGetBirthDate(hContact)) { MZodiac zodiac; //ICONINFO iinfo; - WCHAR szFileName[MAX_PATH]; + wchar_t szFileName[MAX_PATH]; // get zodiac for birthday zodiac = mtb.Zodiac(); -- cgit v1.2.3