Let the base classes decide the default error mode

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

diff --git a/source/stringcodec/iso88591.h b/source/stringcodec/iso88591.h
index d779ff071bf2cf70bb2b0905501b833214748262..2b5a624612d74c29da30b44f166f0713220147e2 100644 (file)
--- a/source/stringcodec/iso88591.h
+++ b/source/stringcodec/iso88591.h
@@ -1,39 +1,38 @@
-#ifndef MSP_STRINGS_ISO88591_H_
-#define MSP_STRINGS_ISO88591_H_
+#ifndef MSP_STRINGCODEC_ISO88591_H_
+#define MSP_STRINGCODEC_ISO88591_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
-class Iso88591: public Codec
+class Iso88591: public StandardCodec<Iso88591>
 {
 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-8859-1"; }
+       Iso88591(ErrorMode em = DEFAULT): StandardCodec<Iso88591>(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-8859-1"; }
 };
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif