Incorporated TimWs current source tree and make it compile

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
@@ -60,7 +60,17 @@ inline QString toQString(tchar *_p, unsigned int len)
     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;
 }