diff options
| author | George Hazan <ghazan@miranda.im> | 2021-12-26 15:13:30 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2021-12-26 15:13:30 +0300 |
| commit | d7e53c4d5a748d5ef8c934e90dc59ff23c667420 (patch) | |
| tree | 2b0c16de953e182321a0314b6ce3b909f428731f /plugins/MirandaG15 | |
| parent | 129687d805025b4e292174ffb3d224a55baf24d2 (diff) | |
WCHAR -> wchar_t
Diffstat (limited to 'plugins/MirandaG15')
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/misc.cpp | 8 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/misc.h | 4 |
2 files changed, 6 insertions, 6 deletions
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 )
|