X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstringcodec%2Fjisx0208.h;h=0f29432efbfe91cb042ab8f8ff177d1174ca189e;hp=0c4c4a6d06ea04a86ba3a9f5c4b80de1c44b1404;hb=HEAD;hpb=b42ed73a1b241c0e93ee03c43c4584b41c549bac

diff --git a/source/stringcodec/jisx0208.h b/source/stringcodec/jisx0208.h
index 0c4c4a6..0f29432 100644
--- a/source/stringcodec/jisx0208.h
+++ b/source/stringcodec/jisx0208.h
@@ -1,65 +1,56 @@
-/* $Id$
-
-This file is part of libmspstrings
-Copyright © 2006-2007 Mikko Rasa
-Distributed under the LGPL
-*/
-
-#ifndef MSP_STRINGS_JISX0208_H_
-#define MSP_STRINGS_JISX0208_H_
+#ifndef MSP_STRINGCODEC_JISX0208_H_
+#define MSP_STRINGCODEC_JISX0208_H_
 
+#include <msp/core/mspcore_api.h>
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
 /**
 Codec for the JIS X 0208 encoding.  This is not particularly useful as a
 stand-alone codec, due to lack of a linefeed character among other things,
 but is included as part of some other encodings.
 */
-class JisX0208: public Codec
+class MSPCORE_API JisX0208: public StandardCodec<JisX0208>
 {
 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 "JIS X 0208"; }
+	JisX0208(ErrorMode em = DEFAULT): StandardCodec<JisX0208>(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 "JIS X 0208"; }
 };
 
 
 struct Kuten
 {
-	unsigned short ku;
-	unsigned short ten;
-
-	Kuten(): ku(0), ten(0) { }
+	unsigned short ku = 0;
+	unsigned short ten = 0;
 
-	operator bool() { return ku!=0 && ten!=0; }
+	explicit operator bool() { return ku!=0 && ten!=0; }
 };
 
-extern UnicodeChar jisx0208_to_ucs(Kuten);
-extern Kuten ucs_to_jisx0208(UnicodeChar);
+MSPCORE_API unichar jisx0208_to_ucs(Kuten);
+MSPCORE_API Kuten ucs_to_jisx0208(unichar);
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif