Let the base classes decide the default error mode

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

diff --git a/source/stringcodec/jisx0201.h b/source/stringcodec/jisx0201.h
index 41332de93fe1ed6ab77ca4bad63082ab1e8248f4..1e7c8ef2e70d4741b91f964ef6b9353e6e19f5a9 100644 (file)
--- a/source/stringcodec/jisx0201.h
+++ b/source/stringcodec/jisx0201.h
@@ -1,46 +1,38 @@
-/* $Id$
-
-This file is part of libmspstrings
-Copyright © 2006-2007 Mikko Rasa
-Distributed under the LGPL
-*/
-
-#ifndef MSP_STRINGS_JISX201_H_
-#define MSP_STRINGS_JISX201_H_
+#ifndef MSP_STRINGCODEC_JISX201_H_
+#define MSP_STRINGCODEC_JISX201_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
-class JisX0201: public Codec
+class JisX0201: public StandardCodec<JisX0201>
 {
 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 "JIS X 0201"; }
+       JisX0201(ErrorMode em = DEFAULT): StandardCodec<JisX0201>(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 "JIS X 0201"; }
 };
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif