X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstringcodec%2Fiso885915.h;h=2e812459af64e77199ec437a7de2e831cff462cc;hb=6af098355f2b037a6f8084f9f6c741e462ffa614;hp=3237c84248688d70c42081afcdcc320b4ad3bf04;hpb=b56eb5ec1da675da0c66abc53c1e4f6c4e4cccbd;p=libs%2Fcore.git

diff --git a/source/stringcodec/iso885915.h b/source/stringcodec/iso885915.h
index 3237c84..2e81245 100644
--- a/source/stringcodec/iso885915.h
+++ b/source/stringcodec/iso885915.h
@@ -1,46 +1,39 @@
-/* $Id$
-
-This file is part of libmspstrings
-Copyright © 2007 Mikko Rasa
-Distributed under the LGPL
-*/
-
-#ifndef MSP_STRINGS_ISO885915_H_
-#define MSP_STRINGS_ISO885915_H_
+#ifndef MSP_STRINGCODEC_ISO885915_H_
+#define MSP_STRINGCODEC_ISO885915_H_
 
+#include <msp/core/mspcore_api.h>
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
-class Iso885915: public Codec
+class MSPCORE_API Iso885915: public StandardCodec<Iso885915>
 {
 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 "ISO-8859-15"; }
+	Iso885915(ErrorMode em = DEFAULT): 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); }
+	const char *get_name() const override { return "ISO-8859-15"; }
 };
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif