Let the base classes decide the default error mode

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

diff --git a/source/stringcodec/windows1252.h b/source/stringcodec/windows1252.h
index 47b2cf0f8e2805e7dfd463bc06a45158853f5d6f..c5d140fe06347d5d06f6d2aa44dbd1aafd78ab71 100644 (file)
--- a/source/stringcodec/windows1252.h
+++ b/source/stringcodec/windows1252.h
@@ -1,46 +1,38 @@
-/* $Id$
-
-This file is part of libmspstrings
-Copyright © 2006-2007 Mikko Rasa
-Distributed under the LGPL
-*/
-
-#ifndef MSP_STRINGS_WINDOWS1252_H_
-#define MSP_STRINGS_WINDOWS1252_H_
+#ifndef MSP_STRINGCODEC_WINDOWS1252_H_
+#define MSP_STRINGCODEC_WINDOWS1252_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
-class Windows1252: public Codec
+class Windows1252: public StandardCodec<Windows1252>
 {
 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 "Windows-1252"; }
+       Windows1252(ErrorMode em = DEFAULT): StandardCodec<Windows1252>(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 "Windows-1252"; }
 };
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif