Let the base classes decide the default error mode

[libs/core.git] / source / stringcodec / iso646fi.h

diff --git a/source/stringcodec/iso646fi.h b/source/stringcodec/iso646fi.h
index 1767ca8e842021ff75f2a7e675a475c50b204db5..2266c2ca06f24a081d34d3abe7be009f67b95cf0 100644 (file)
--- a/source/stringcodec/iso646fi.h
+++ b/source/stringcodec/iso646fi.h
@@ -6,31 +6,30 @@
 namespace Msp {
 namespace StringCodec {
 
-class Iso646Fi: public Codec
+class Iso646Fi: public StandardCodec<Iso646Fi>
 {
 public:
        class Encoder: public Codec::Encoder
        {
        public:
-               Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em) { }
+               Encoder(ErrorMode em = DEFAULT): Codec::Encoder(em) { }
 
-               virtual void encode_char(UnicodeChar, std::string &);
+               virtual void encode_char(unichar, std::string &);
        private:
-               virtual void transliterate(UnicodeChar, std::string &);
+               virtual void transliterate(unichar, std::string &);
        };
 
        class Decoder: public Codec::Decoder
        {
        public:
-               Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
+               Decoder(ErrorMode em = DEFAULT): Codec::Decoder(em) { }
 
-               virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
+               virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
-       virtual const char *get_name() const { return "ISO-646-FI"; }
+       Iso646Fi(ErrorMode em = DEFAULT): StandardCodec<Iso646Fi>(em) { }
 
-       virtual Encoder *create_encoder(ErrorMode em = THROW_ON_ERROR) const { return new Encoder(em); }
-       virtual Decoder *create_decoder(ErrorMode em = THROW_ON_ERROR) const { return new Decoder(em); }
+       virtual const char *get_name() const { return "ISO-646-FI"; }
 };
 
 } // namespace StringCodec