X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstringcodec%2Fwindows1252.h;h=bcea69b7a60e6818cad0bcef0137c10228012d81;hp=f790f39503bd5f2c8d4e34813dce05b5398bd661;hb=HEAD;hpb=967785734be5c3fc6f75da122c2d93ebbb338271

diff --git a/source/stringcodec/windows1252.h b/source/stringcodec/windows1252.h
index f790f39..b89fdae 100644
--- a/source/stringcodec/windows1252.h
+++ b/source/stringcodec/windows1252.h
@@ -1,39 +1,39 @@
-#ifndef MSP_STRINGS_WINDOWS1252_H_
-#define MSP_STRINGS_WINDOWS1252_H_
+#ifndef MSP_STRINGCODEC_WINDOWS1252_H_
+#define MSP_STRINGCODEC_WINDOWS1252_H_
 
+#include <msp/core/mspcore_api.h>
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
-class Windows1252: public Codec
+class MSPCORE_API Windows1252: public StandardCodec<Windows1252>
 {
 public:
-	class Encoder: public Codec::Encoder
+	class MSPCORE_API 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 &);
+		void encode_char(unichar, std::string &) override;
 	private:
-		virtual void transliterate(UnicodeChar, std::string &);
+		void transliterate(unichar, std::string &) override;
 	};
 
-	class Decoder: public Codec::Decoder
+	class MSPCORE_API 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 &);
+		unichar decode_char(const std::string &, std::string::const_iterator &) override;
 	};
 
-	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); }
+	const char *get_name() const override { return "Windows-1252"; }
 };
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif