summaryrefslogtreecommitdiff
path: root/noncore/apps/opie-reader/CEncoding.cpp
Unidiff
Diffstat (limited to 'noncore/apps/opie-reader/CEncoding.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-reader/CEncoding.cpp30
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,10 +1,10 @@
1#include <stdio.h> 1#include <stdio.h>
2#include "CEncoding.h" 2#include "CEncoding.h"
3 3
4void CUtf8::getch(tchar& ch, CStyle& sty) 4void 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 {
10 ch = UEOF; 10 ch = UEOF;
@@ -18,7 +18,7 @@ void CUtf8::getch(tchar& ch, CStyle& sty)
18 { 18 {
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;
24 count++; 24 count++;
@@ -43,38 +43,38 @@ void CUtf8::getch(tchar& ch, CStyle& sty)
43 return; 43 return;
44} 44}
45 45
46void CUcs16be::getch(tchar& ch, CStyle& sty) 46void 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 {
52 ch = UEOF; 52 ch = UEOF;
53 return; 53 return;
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
60void CUcs16le::getch(tchar& ch, CStyle& sty) 60void 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 {
66 ch = UEOF; 66 ch = UEOF;
67 return; 67 return;
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
74void Ccp1252::getch(tchar& ch, CStyle& sty) 74void 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)
80 { 80 {
@@ -167,9 +167,9 @@ void Ccp1252::getch(tchar& ch, CStyle& sty)
167 } 167 }
168} 168}
169 169
170void CPalm::getch(tchar& ch, CStyle& sty) 170void 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 {
175 case 0x18: 175 case 0x18:
@@ -195,10 +195,10 @@ void CPalm::getch(tchar& ch, CStyle& sty)
195 } 195 }
196} 196}
197 197
198void CAscii::getch(tchar& ch, CStyle& sty) 198void 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 {
204 ch = UEOF; 204 ch = UEOF;