| author | groucho <groucho> | 2003-05-07 09:01:39 (UTC) |
|---|---|---|
| committer | groucho <groucho> | 2003-05-07 09:01:39 (UTC) |
| commit | 118d03d815a7615b9c53363218a7ac45b3f4c514 (patch) (side-by-side diff) | |
| tree | 356953e2413cddcec0f35bd47bb6439767da7051 /noncore/apps/opie-reader/CEncoding.cpp | |
| parent | 00894537decf01c5a5cdc565b2740b5e67a2e90f (diff) | |
| download | opie-118d03d815a7615b9c53363218a7ac45b3f4c514.zip opie-118d03d815a7615b9c53363218a7ac45b3f4c514.tar.gz opie-118d03d815a7615b9c53363218a7ac45b3f4c514.tar.bz2 | |
Incorporated TimWs current source tree and make it compile
Diffstat (limited to 'noncore/apps/opie-reader/CEncoding.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/apps/opie-reader/CEncoding.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/noncore/apps/opie-reader/CEncoding.cpp b/noncore/apps/opie-reader/CEncoding.cpp index c1dcfe8..60a1057 100644 --- a/noncore/apps/opie-reader/CEncoding.cpp +++ b/noncore/apps/opie-reader/CEncoding.cpp @@ -3,14 +3,13 @@ void CUtf8::getch(tchar& ch, CStyle& sty) { - int iret; - parent->getch(iret, sty); - if (iret == EOF) + tchar ret; + parent->getch(ret, sty); + if (ret == UEOF) { ch = UEOF; return; } - tchar ret = iret; int count = 0; if (ret & (1 << 7)) { @@ -18,6 +17,7 @@ void CUtf8::getch(tchar& ch, CStyle& sty) while ((flags & (1 << 7)) != 0) { ret <<= 6; + tchar iret; parent->getch(iret, sty); ret += iret & 0x3f; flags <<= 1; @@ -45,9 +45,9 @@ void CUtf8::getch(tchar& ch, CStyle& sty) void CUcs16be::getch(tchar& ch, CStyle& sty) { - int iret; + tchar iret; parent->getch(iret, sty); - if (iret == EOF) + if (iret == UEOF) { ch = UEOF; return; @@ -59,9 +59,9 @@ void CUcs16be::getch(tchar& ch, CStyle& sty) void CUcs16le::getch(tchar& ch, CStyle& sty) { - int iret; + tchar iret; parent->getch(iret, sty); - if (iret == EOF) + if (iret == UEOF) { ch = UEOF; return; @@ -73,12 +73,12 @@ void CUcs16le::getch(tchar& ch, CStyle& sty) void Ccp1252::getch(tchar& ch, CStyle& sty) { - int iret; + tchar iret; parent->getch(iret, sty); ch = iret; switch (ch) { - case EOF: + case UEOF: ch = UEOF; break; case 0x80: @@ -197,9 +197,9 @@ void CPalm::getch(tchar& ch, CStyle& sty) void CAscii::getch(tchar& ch, CStyle& sty) { - int iret; + tchar iret; parent->getch(iret, sty); - if (iret == EOF) + if (iret == UEOF) { ch = UEOF; } |