Remove deprecated things

[libs/core.git] / source / stringcodec / iso885915.cpp

diff --git a/source/stringcodec/iso885915.cpp b/source/stringcodec/iso885915.cpp
index 8e121adda4068a636222936dac3bd9c2a2b23c99..eb26264d8dd5bacd7d72bc481ffbad5632dc25c7 100644 (file)
--- a/source/stringcodec/iso885915.cpp
+++ b/source/stringcodec/iso885915.cpp
@@ -25,38 +25,29 @@ const int mapping[map_size*2]=
 namespace Msp {
 namespace StringCodec {
 
-void Iso885915::Encoder::encode_char(UnicodeChar ch, string &buf)
+void Iso885915::Encoder::encode_char(unichar ch, string &buf)
 {
        int tch = transform_mapping_or_direct(mapping, map_size, ch, false);
        if(tch<0 || tch>0xFF)
-               error(ch, buf, "Can't express character in ISO-8859-15");
+               error(ch, buf, invalid_character(ch, "ISO-8859-15"));
        else
                buf += tch;
 
 }
 
-void Iso885915::Encoder::transliterate(UnicodeChar, string &buf)
+void Iso885915::Encoder::transliterate(unichar, string &buf)
 {
        buf += '?';
 }
 
 
-UnicodeChar Iso885915::Decoder::decode_char(const string &str, string::const_iterator &i)
+unichar Iso885915::Decoder::decode_char(const string &str, string::const_iterator &i)
 {
        if(i==str.end())
-               return error("No input");
+               return -1;
 
-       unsigned char ch = *i;
-       int tch = transform_mapping_or_direct(mapping, map_size, ch, true);
-
-       UnicodeChar result;
-       if(tch==-1)
-               result = error("Undefined ISO-8859-15 character");
-       else
-               result = tch;
-
-       ++i;
-       return result;
+       unsigned char ch = *i++;
+       return transform_mapping_or_direct(mapping, map_size, ch, true);
 }
 
 } // namespace StringCodec