X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstringcodec%2Fwindows1252.cpp;fp=source%2Fstringcodec%2Fwindows1252.cpp;h=531860bca47331a94f2dcae77be1f240573ac209;hb=02794ef3620d0d9cc3b8f1c0d8f2995c825fdf4f;hp=dc03172ce42063df056a005b6025e9d94e7cba77;hpb=b011b17393069d86790b2291a759280e15c75a0f;p=libs%2Fcore.git diff --git a/source/stringcodec/windows1252.cpp b/source/stringcodec/windows1252.cpp index dc03172..531860b 100644 --- a/source/stringcodec/windows1252.cpp +++ b/source/stringcodec/windows1252.cpp @@ -18,7 +18,7 @@ unsigned short table[32]= namespace Msp { namespace StringCodec { -void Windows1252::Encoder::encode_char(UnicodeChar ch, string &buf) +void Windows1252::Encoder::encode_char(unichar ch, string &buf) { if((ch>=0 && ch<=0x7F) || (ch>=0xA0 && ch<=0xFF)) buf += ch; @@ -35,19 +35,19 @@ void Windows1252::Encoder::encode_char(UnicodeChar ch, string &buf) } } -void Windows1252::Encoder::transliterate(UnicodeChar, string &buf) +void Windows1252::Encoder::transliterate(unichar, string &buf) { buf += '?'; } -UnicodeChar Windows1252::Decoder::decode_char(const string &str, string::const_iterator &i) +unichar Windows1252::Decoder::decode_char(const string &str, string::const_iterator &i) { if(i==str.end()) return error("No input"); int ch = static_cast(*i); - UnicodeChar result; + unichar result; if(ch>=0x80 && ch<=0x9F) { result = table[ch-0x80];