Allow error mode to be specified when creating the codec object

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

diff --git a/source/stringcodec/iso885915.h b/source/stringcodec/iso885915.h
index 06c53018fba231a2c2afda76c0150069822a0c3c..5d6573043ce61a3950c0eaeeda546c7dd632c30a 100644 (file)
--- a/source/stringcodec/iso885915.h
+++ b/source/stringcodec/iso885915.h
@@ -1,12 +1,12 @@
-#ifndef MSP_STRINGS_ISO885915_H_
-#define MSP_STRINGS_ISO885915_H_
+#ifndef MSP_STRINGCODEC_ISO885915_H_
+#define MSP_STRINGCODEC_ISO885915_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
-class Iso885915: public Codec
+class Iso885915: public StandardCodec<Iso885915>
 {
 public:
        class Encoder: public Codec::Encoder
@@ -14,9 +14,9 @@ public:
        public:
                Encoder(ErrorMode em = THROW_ON_ERROR): 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
@@ -24,16 +24,15 @@ public:
        public:
                Decoder(ErrorMode em = THROW_ON_ERROR): 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-15"; }
+       Iso885915(ErrorMode em = THROW_ON_ERROR): StandardCodec<Iso885915>(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-15"; }
 };
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif