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/MirandaG15/src/LCDFramework/misc.cpp | 8 ++++---- plugins/MirandaG15/src/LCDFramework/misc.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/MirandaG15') diff --git a/plugins/MirandaG15/src/LCDFramework/misc.cpp b/plugins/MirandaG15/src/LCDFramework/misc.cpp index deb4430545..97aaeea30f 100644 --- a/plugins/MirandaG15/src/LCDFramework/misc.cpp +++ b/plugins/MirandaG15/src/LCDFramework/misc.cpp @@ -93,14 +93,14 @@ tstring Utf8_Decode(const char *str) int i; char *p; - WCHAR *wszTemp = nullptr; + wchar_t *wszTemp = nullptr; if (str == nullptr) return strRes; size_t len = mir_strlen(str); - if ((wszTemp = (WCHAR *)malloc(sizeof(wchar_t) * (len + 2))) == nullptr) + if ((wszTemp = (wchar_t *)malloc(sizeof(wchar_t) * (len + 2))) == nullptr) return strRes; p = (char *)str; @@ -131,13 +131,13 @@ tstring Utf8_Decode(const char *str) * free() the return value */ -string Utf8_Encode(const WCHAR *str) +string Utf8_Encode(const wchar_t *str) { string strRes = ""; unsigned char *szOut = nullptr; int len, i; - const WCHAR *wszTemp, *w; + const wchar_t *wszTemp, *w; if (str == nullptr) return strRes; diff --git a/plugins/MirandaG15/src/LCDFramework/misc.h b/plugins/MirandaG15/src/LCDFramework/misc.h index 3707ef3a34..3949b72567 100644 --- a/plugins/MirandaG15/src/LCDFramework/misc.h +++ b/plugins/MirandaG15/src/LCDFramework/misc.h @@ -57,8 +57,8 @@ inline std::string toNarrowString( const std::string& str ) extern tstring Utf8_Decode(const char *str); -// extern WCHAR *Utf8_Decode(const char *str); - extern string Utf8_Encode(const WCHAR *str); +// extern wchar_t *Utf8_Decode(const char *str); + extern string Utf8_Encode(const wchar_t *str); #else #define tstring string inline wchar_t toTchar( char ch ) -- cgit v1.2.3