diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-07-26 09:20:25 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-07-26 09:20:25 +0000 |
| commit | 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac (patch) | |
| tree | 2e8bb660c908b54914abd562af8aafa4a486c846 /libs/libjson/src/libJSON.cpp | |
| parent | a61c8728b379057fe7f0a0d86fe0b037598229dd (diff) | |
less TCHARs:
- TCHAR is replaced with wchar_t everywhere;
- LPGENT replaced with either LPGENW or LPGEN;
- fixes for ANSI plugins that improperly used _t functions;
- TCHAR *t removed from MAllStrings;
- ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*
git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'libs/libjson/src/libJSON.cpp')
| -rw-r--r-- | libs/libjson/src/libJSON.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/libjson/src/libJSON.cpp b/libs/libjson/src/libJSON.cpp index 255e3b1d06..a14c7865e2 100644 --- a/libs/libjson/src/libJSON.cpp +++ b/libs/libjson/src/libJSON.cpp @@ -53,7 +53,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern JSONNode nullNode;
-inline TCHAR* toCString(const json_string & str)
+inline wchar_t* toCString(const json_string & str)
{
return mir_utf8decodeT( str.c_str());
}
@@ -102,7 +102,7 @@ LIBJSON_DLL(JSONNode*) json_parse(const json_char *json) { return 0;
}
-LIBJSON_DLL(TCHAR*) json_strip_white_space(const json_char *json) {
+LIBJSON_DLL(wchar_t*) json_strip_white_space(const json_char *json) {
JSON_ASSERT_SAFE(json, JSON_TEXT("null ptr to json_strip_white_space"), return 0;);
return toCString(JSONWorker::RemoveWhiteSpaceAndComments(json));
}
@@ -277,7 +277,7 @@ LIBJSON_DLL(const json_char*) json_name(const JSONNode *node) { }
#endif
-LIBJSON_DLL(TCHAR*) json_as_string(const JSONNode *node) {
+LIBJSON_DLL(wchar_t*) json_as_string(const JSONNode *node) {
JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_as_string"), return toCString(EMPTY_CSTRING););
return toCString(node->as_string());
}
@@ -325,12 +325,12 @@ LIBJSON_DLL(JSONNode*) json_as_array(const JSONNode *node) { #endif
#ifdef JSON_WRITER
- LIBJSON_DLL(TCHAR*) json_write(const JSONNode *node) {
+ LIBJSON_DLL(wchar_t*) json_write(const JSONNode *node) {
JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_write"), return toCString(EMPTY_CSTRING););
return toCString(node->write());
}
- LIBJSON_DLL(TCHAR*) json_write_formatted(const JSONNode *node) {
+ LIBJSON_DLL(wchar_t*) json_write_formatted(const JSONNode *node) {
JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_write_formatted"), return toCString(EMPTY_CSTRING););
return toCString(node->write_formatted());
}
|