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 | |||
@@ -2,8 +2,8 @@ | |||
2 | #include "CEncoding.h" | 2 | #include "CEncoding.h" |
3 | 3 | ||
4 | void CUtf8::getch(tchar& ch, CStyle& sty) | 4 | void CUtf8::getch(tchar& ch, CStyle& sty, unsigned long& pos) |
5 | { | 5 | { |
6 | tchar ret; | 6 | tchar ret; |
7 | parent->getch(ret, sty); | 7 | parent->getch(ret, sty, pos); |
8 | if (ret == UEOF) | 8 | if (ret == UEOF) |
9 | { | 9 | { |
@@ -19,5 +19,5 @@ void CUtf8::getch(tchar& ch, CStyle& sty) | |||
19 | ret <<= 6; | 19 | ret <<= 6; |
20 | tchar iret; | 20 | tchar iret; |
21 | parent->getch(iret, sty); | 21 | parent->getch(iret, sty, pos); |
22 | ret += iret & 0x3f; | 22 | ret += iret & 0x3f; |
23 | flags <<= 1; | 23 | flags <<= 1; |
@@ -44,8 +44,8 @@ void CUtf8::getch(tchar& ch, CStyle& sty) | |||
44 | } | 44 | } |
45 | 45 | ||
46 | void CUcs16be::getch(tchar& ch, CStyle& sty) | 46 | void CUcs16be::getch(tchar& ch, CStyle& sty, unsigned long& pos) |
47 | { | 47 | { |
48 | tchar iret; | 48 | tchar iret; |
49 | parent->getch(iret, sty); | 49 | parent->getch(iret, sty, pos); |
50 | if (iret == UEOF) | 50 | if (iret == UEOF) |
51 | { | 51 | { |
@@ -54,12 +54,12 @@ void CUcs16be::getch(tchar& ch, CStyle& sty) | |||
54 | } | 54 | } |
55 | tchar ret = iret; | 55 | tchar ret = iret; |
56 | parent->getch(iret, sty); | 56 | parent->getch(iret, sty, pos); |
57 | ch = (ret << 8) + iret; | 57 | ch = (ret << 8) + iret; |
58 | } | 58 | } |
59 | 59 | ||
60 | void CUcs16le::getch(tchar& ch, CStyle& sty) | 60 | void CUcs16le::getch(tchar& ch, CStyle& sty, unsigned long& pos) |
61 | { | 61 | { |
62 | tchar iret; | 62 | tchar iret; |
63 | parent->getch(iret, sty); | 63 | parent->getch(iret, sty, pos); |
64 | if (iret == UEOF) | 64 | if (iret == UEOF) |
65 | { | 65 | { |
@@ -68,12 +68,12 @@ void CUcs16le::getch(tchar& ch, CStyle& sty) | |||
68 | } | 68 | } |
69 | tchar ret = iret; | 69 | tchar ret = iret; |
70 | parent->getch(iret, sty); | 70 | parent->getch(iret, sty, pos); |
71 | ch = ret + (iret << 8); | 71 | ch = ret + (iret << 8); |
72 | } | 72 | } |
73 | 73 | ||
74 | void Ccp1252::getch(tchar& ch, CStyle& sty) | 74 | void Ccp1252::getch(tchar& ch, CStyle& sty, unsigned long& pos) |
75 | { | 75 | { |
76 | tchar iret; | 76 | tchar iret; |
77 | parent->getch(iret, sty); | 77 | parent->getch(iret, sty, pos); |
78 | ch = iret; | 78 | ch = iret; |
79 | switch (ch) | 79 | switch (ch) |
@@ -168,7 +168,7 @@ void Ccp1252::getch(tchar& ch, CStyle& sty) | |||
168 | } | 168 | } |
169 | 169 | ||
170 | void CPalm::getch(tchar& ch, CStyle& sty) | 170 | void CPalm::getch(tchar& ch, CStyle& sty, unsigned long& pos) |
171 | { | 171 | { |
172 | Ccp1252::getch(ch, sty); | 172 | Ccp1252::getch(ch, sty, pos); |
173 | switch (ch) | 173 | switch (ch) |
174 | { | 174 | { |
@@ -196,8 +196,8 @@ void CPalm::getch(tchar& ch, CStyle& sty) | |||
196 | } | 196 | } |
197 | 197 | ||
198 | void CAscii::getch(tchar& ch, CStyle& sty) | 198 | void CAscii::getch(tchar& ch, CStyle& sty, unsigned long& pos) |
199 | { | 199 | { |
200 | tchar iret; | 200 | tchar iret; |
201 | parent->getch(iret, sty); | 201 | parent->getch(iret, sty, pos); |
202 | if (iret == UEOF) | 202 | if (iret == UEOF) |
203 | { | 203 | { |