Diffstat (limited to 'noncore/apps/opie-reader/ustring.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/opie-reader/ustring.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/noncore/apps/opie-reader/ustring.h b/noncore/apps/opie-reader/ustring.h index a3ef8df..95da26b 100644 --- a/noncore/apps/opie-reader/ustring.h +++ b/noncore/apps/opie-reader/ustring.h | |||
@@ -51,25 +51,35 @@ inline QString toQString(tchar *_p) | |||
51 | tchar *p = _p; | 51 | tchar *p = _p; |
52 | QString ret; | 52 | QString ret; |
53 | while (*p != 0) ret[i++] = *(p++); | 53 | while (*p != 0) ret[i++] = *(p++); |
54 | return ret; | 54 | return ret; |
55 | } | 55 | } |
56 | 56 | ||
57 | inline QString toQString(tchar *_p, unsigned int len) | 57 | inline QString toQString(tchar *_p, unsigned int len) |
58 | { | 58 | { |
59 | if (_p == NULL) return 0; | 59 | if (_p == NULL) return 0; |
60 | unsigned int i = 0; | 60 | unsigned int i = 0; |
61 | tchar *p = _p; | 61 | tchar *p = _p; |
62 | QString ret; | 62 | QString ret; |
63 | #ifdef _WINDOWS | ||
64 | //ret.fill(' ', len); | ||
65 | for (i = 0; i < len; i++) | ||
66 | { | ||
67 | if (p[i] == 0) break; | ||
68 | ret.at((uint)i) = p[i]; | ||
69 | } | ||
70 | // while (*p != 0 && i < len) ret.at((uint)i++) = (tchar)(*(p++)); | ||
71 | #else | ||
63 | while (*p != 0 && i < len) ret[i++] = *(p++); | 72 | while (*p != 0 && i < len) ret[i++] = *(p++); |
73 | #endif | ||
64 | return ret; | 74 | return ret; |
65 | } | 75 | } |
66 | 76 | ||
67 | inline tchar* fromQString(const QString& qs) | 77 | inline tchar* fromQString(const QString& qs) |
68 | { | 78 | { |
69 | int len = qs.length(); | 79 | int len = qs.length(); |
70 | tchar* ret = new tchar[len+1]; | 80 | tchar* ret = new tchar[len+1]; |
71 | for (int i = 0; i < len; i++) | 81 | for (int i = 0; i < len; i++) |
72 | { | 82 | { |
73 | ret[i] = qs[i].unicode(); | 83 | ret[i] = qs[i].unicode(); |
74 | } | 84 | } |
75 | ret[len] = 0; | 85 | ret[len] = 0; |