Diffstat (limited to 'noncore/apps/opie-reader/CEncoding.cpp') (more/less context) (show 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 @@ -4,12 +4,11 @@ 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)) @@ -19,4 +18,5 @@ void CUtf8::getch(tchar& ch, CStyle& sty) { ret <<= 6; + tchar iret; parent->getch(iret, sty); ret += iret & 0x3f; @@ -46,7 +46,7 @@ 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; @@ -60,7 +60,7 @@ 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; @@ -74,10 +74,10 @@ 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; @@ -198,7 +198,7 @@ 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; |