Diffstat (limited to 'noncore/apps/opie-reader/CEncoding.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/apps/opie-reader/CEncoding.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/noncore/apps/opie-reader/CEncoding.cpp b/noncore/apps/opie-reader/CEncoding.cpp index 60a1057..cf2e01b 100644 --- a/noncore/apps/opie-reader/CEncoding.cpp +++ b/noncore/apps/opie-reader/CEncoding.cpp @@ -1,11 +1,11 @@ #include <stdio.h> #include "CEncoding.h" -void CUtf8::getch(tchar& ch, CStyle& sty) +void CUtf8::getch(tchar& ch, CStyle& sty, unsigned long& pos) { tchar ret; - parent->getch(ret, sty); + parent->getch(ret, sty, pos); if (ret == UEOF) { ch = UEOF; return; @@ -17,9 +17,9 @@ void CUtf8::getch(tchar& ch, CStyle& sty) while ((flags & (1 << 7)) != 0) { ret <<= 6; tchar iret; - parent->getch(iret, sty); + parent->getch(iret, sty, pos); ret += iret & 0x3f; flags <<= 1; count++; } @@ -42,40 +42,40 @@ void CUtf8::getch(tchar& ch, CStyle& sty) ch = ret; return; } -void CUcs16be::getch(tchar& ch, CStyle& sty) +void CUcs16be::getch(tchar& ch, CStyle& sty, unsigned long& pos) { tchar iret; - parent->getch(iret, sty); + parent->getch(iret, sty, pos); if (iret == UEOF) { ch = UEOF; return; } tchar ret = iret; - parent->getch(iret, sty); + parent->getch(iret, sty, pos); ch = (ret << 8) + iret; } -void CUcs16le::getch(tchar& ch, CStyle& sty) +void CUcs16le::getch(tchar& ch, CStyle& sty, unsigned long& pos) { tchar iret; - parent->getch(iret, sty); + parent->getch(iret, sty, pos); if (iret == UEOF) { ch = UEOF; return; } tchar ret = iret; - parent->getch(iret, sty); + parent->getch(iret, sty, pos); ch = ret + (iret << 8); } -void Ccp1252::getch(tchar& ch, CStyle& sty) +void Ccp1252::getch(tchar& ch, CStyle& sty, unsigned long& pos) { tchar iret; - parent->getch(iret, sty); + parent->getch(iret, sty, pos); ch = iret; switch (ch) { case UEOF: @@ -166,11 +166,11 @@ void Ccp1252::getch(tchar& ch, CStyle& sty) break; } } -void CPalm::getch(tchar& ch, CStyle& sty) +void CPalm::getch(tchar& ch, CStyle& sty, unsigned long& pos) { - Ccp1252::getch(ch, sty); + Ccp1252::getch(ch, sty, pos); switch (ch) { case 0x18: ch = 0x2026; @@ -194,12 +194,12 @@ void CPalm::getch(tchar& ch, CStyle& sty) break; } } -void CAscii::getch(tchar& ch, CStyle& sty) +void CAscii::getch(tchar& ch, CStyle& sty, unsigned long& pos) { tchar iret; - parent->getch(iret, sty); + parent->getch(iret, sty, pos); if (iret == UEOF) { ch = UEOF; } |