X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fwindows1252.h;h=f817a0d2e10c68cb577a074d3645bce2ae3d84d7;hb=a0a5c796a6ec11a13c49912672a82bf1857bbc71;hp=63cb42f7eaf94ca1e0752da5550380bee7fa55a4;hpb=6cbf9d2160a9f8e1ef98acb63ead3a14c88e2703;p=libs%2Fcore.git

diff --git a/source/windows1252.h b/source/windows1252.h
index 63cb42f..f817a0d 100644
--- a/source/windows1252.h
+++ b/source/windows1252.h
@@ -11,30 +11,34 @@ Distributed under the LGPL
 #include "codec.h"
 
 namespace Msp {
+namespace Codecs {
 
-class Windows1252: public StringCodec
+class Windows1252: public Codec
 {
 public:
-	class Encoder: public StringCodec::Encoder
+	class Encoder: public Codec::Encoder
 	{
 	public:
-		Encoder(ErrorMode em=THROW_ON_ERROR): StringCodec::Encoder(em) { }
-		void encode_char(wchar_t);
+		Encoder(ErrorMode em=THROW_ON_ERROR): Codec::Encoder(em) { }
+		virtual void encode_char(UnicodeChar, std::string &);
 	private:
-		void append_replacement() { append(032); }
+		virtual void transliterate(UnicodeChar, std::string &);
 	};
 
-	class Decoder: public StringCodec::Decoder
+	class Decoder: public Codec::Decoder
 	{
 	public:
-		Decoder(ErrorMode em=THROW_ON_ERROR): StringCodec::Decoder(em) { }
-		void decode_char(const std::string &, std::string::const_iterator &);
+		Decoder(ErrorMode em=THROW_ON_ERROR): Codec::Decoder(em) { }
+		virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
 	};
 
-	Encoder *create_encoder(ErrorMode em=THROW_ON_ERROR) const { return new Encoder(em); }
-	Decoder *create_decoder(ErrorMode em=THROW_ON_ERROR) const { return new Decoder(em); }
+	virtual const char *get_name() const { return "Windows-1252"; }
+
+	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); }
 };
 
+} // namespace Codecs
 } // namespace Msp
 
 #endif