X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstringcodec%2Futf8.h;h=94c627ec5a0ca0f905eac01ea4a4de4ef35fb934;hp=89eced8db3a315e3e65c7a43ac3133cbafa1881f;hb=242a4a9abe1e1113b5eb39aa751aa054f696d7be;hpb=967785734be5c3fc6f75da122c2d93ebbb338271

diff --git a/source/stringcodec/utf8.h b/source/stringcodec/utf8.h
index 89eced8..94c627e 100644
--- a/source/stringcodec/utf8.h
+++ b/source/stringcodec/utf8.h
@@ -1,39 +1,38 @@
-#ifndef MSP_STRINGS_UTF8_H_
-#define MSP_STRINGS_UTF8_H_
+#ifndef MSP_STRINGCODEC_UTF8_H_
+#define MSP_STRINGCODEC_UTF8_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
-class Utf8: public Codec
+class Utf8: public StandardCodec<Utf8>
 {
 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 "UTF-8"; }
+	Utf8(ErrorMode em = DEFAULT): StandardCodec<Utf8>(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 "UTF-8"; }
 };
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif