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
@@ -15,69 +15,79 @@ inline size_t ustrlen(const tchar* _p)
 	    for (int i = 0; i < 20; i++) printf("%c",_p[i]);
 	    printf("\n");
 	}
 */
     }
     return p - _p;
 }
 
 inline int ustrcmp(const tchar* _p1, const tchar* _p2)
 {
     if (_p1 == 0) return 1;
     if (_p2 == 0) return -1;
     const tchar* p1 = _p1, *p2 = _p2;
     while (*p1 != 0)
     {
 /*
 	if (p1 - _p1 == 20)
 	{
 	    printf("ustrcmp::String too long:");
 	    for (int i = 0; i < 20; i++) printf("%c",_p1[i]);
 	    printf("\n");
 	}
 */
 	if (*p1 < *p2) return -1;
 	if (*p1 > *p2) return 1;
 	if (*p2 == 0) return 1;
 	p1++, p2++;
     }
     if (*p2 != 0) return -1;
     return 0;
 }
 
 inline QString toQString(tchar *_p)
 {
     if (_p == NULL) return 0;
     int i = 0;
     tchar *p = _p;
     QString ret;
     while (*p != 0) ret[i++] = *(p++);
     return ret;
 }
 
 inline QString toQString(tchar *_p, unsigned int len)
 {
     if (_p == NULL) return 0;
     unsigned int i = 0;
     tchar *p = _p;
     QString ret;
+#ifdef _WINDOWS

+//	ret.fill(' ', len);

+	for (i = 0; i < len; i++)

+	{

+		if (p[i] == 0) break;

+		ret.at((uint)i) = p[i];

+	}
+//    while (*p != 0 && i < len) ret.at((uint)i++) = (tchar)(*(p++));
+#else
     while (*p != 0 && i < len) ret[i++] = *(p++);
+#endif
     return ret;
 }
 
 inline tchar* fromQString(const QString& qs)
 {
     int len = qs.length();
     tchar* ret = new tchar[len+1];
     for (int i = 0; i < len; i++)
     {
 	ret[i] = qs[i].unicode();
     }
     ret[len] = 0;
     return ret;
 }
 #else
 
 inline size_t ustrlen(const tchar* _p) { return strlen(_p); }
 inline int ustrcmp(const tchar* _p1, const tchar* _p2) { return strcmp(_p1, _p2); }
 
 #endif