From 8fc0da9fc4bcb57895a550e9f4fbe764f84372db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Mon, 18 Dec 2017 15:15:08 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@584 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- src_main/core/pistring.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src_main/core/pistring.cpp b/src_main/core/pistring.cpp index 6774e51e..aa80228b 100755 --- a/src_main/core/pistring.cpp +++ b/src_main/core/pistring.cpp @@ -88,7 +88,7 @@ const int PIString::fromBaseN[] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - # define pisprintf(f, v) char ch[256]; memset(ch, 0, 256); sprintf_s(ch, 256, f, v); #endif #ifdef ANDROID -int wctomb(char * c, wchar_t w) {*c = ((char * )&w)[0]; return 1;} +//int wctomb(char * c, wchar_t w) {*c = ((char * )&w)[0]; return 1;} #endif PIString PIString::itos(const int num) {pisprintf("%d", num); return PIString(ch);} PIString PIString::ltos(const long num) {pisprintf("%ld", num); return PIString(ch);} @@ -215,12 +215,17 @@ void PIString::appendFromChars(const char * c, int s, const char * cp) { int sz; wchar_t wc; mbtowc(0,0,0); // reset mbtowc + //qDebug() << "FromChars ..."; while (s>0) { + //qDebug() << "0" << s; sz = mbtowc(&wc, c, s); + //qDebug() << "1" << sz; if (sz < 1) break; push_back(PIChar(int(wc))); c += sz; s -= sz; + //qDebug() << "2" << c; } + //qDebug() << "FromChars done" << size(); }