From 67d3752f3e59e7f5af163f3521f2c2011392d1f9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 7 Oct 2013 12:03:40 +0000 Subject: - JSONROOT added to handle json parser more conveniently; - TCHAR* is returned everywhere instead of char*; git-svn-id: http://svn.miranda-ng.org/main/trunk@6393 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/mir_core/utf.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mir_core/utf.cpp') diff --git a/src/mir_core/utf.cpp b/src/mir_core/utf.cpp index ef80832761..2a07f24626 100644 --- a/src/mir_core/utf.cpp +++ b/src/mir_core/utf.cpp @@ -247,7 +247,7 @@ int Utf8toUcs2(const char *src, int srclen, wchar_t *dst, int dstlen) ///////////////////////////////////////////////////////////////////////////////////////// // Utf8Decode - converts UTF8-encoded string to the UCS2/MBCS format -MIR_CORE_DLL(char*) Utf8DecodeCP(char* str, int codepage, wchar_t** ucs2) +MIR_CORE_DLL(char*) Utf8DecodeCP(char *str, int codepage, wchar_t **ucs2) { int len; bool needs_free = false; @@ -303,12 +303,12 @@ MIR_CORE_DLL(char*) Utf8DecodeCP(char* str, int codepage, wchar_t** ucs2) return str; } -MIR_CORE_DLL(char*) Utf8Decode(char* str, wchar_t** ucs2) +MIR_CORE_DLL(char*) Utf8Decode(char *str, wchar_t **ucs2) { return Utf8DecodeCP(str, Langpack_GetDefaultCodePage(), ucs2); } -MIR_CORE_DLL(wchar_t*) Utf8DecodeW(const char* str) +MIR_CORE_DLL(wchar_t*) Utf8DecodeW(const char *str) { if (str == NULL) return NULL; @@ -408,7 +408,7 @@ MIR_CORE_DLL(char*) Utf8EncodeW(const wchar_t* src) ///////////////////////////////////////////////////////////////////////////////////////// // Utf8Encode - converts UCS2 string to the UTF8-encoded format -MIR_CORE_DLL(BOOL) Utf8CheckString(const char* str) +MIR_CORE_DLL(BOOL) Utf8CheckString(const char *str) { int expect_bytes = 0, utf_found = 0; -- cgit v1.2.3