X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstringcodec%2Futf8.h;h=fcf23eff35e55e0a03532f9e9b541ea2ac4a6414;hb=d3fc0bf0f20f100f2831188c1ce21461d21c2c7a;hp=b976291b23cc1d0c3990e5de05e25e56abaeced3;hpb=056dc68dfc606a2c14126a70321045d6d9f12e0e;p=libs%2Fcore.git

diff --git a/source/stringcodec/utf8.h b/source/stringcodec/utf8.h
index b976291..fcf23ef 100644
--- a/source/stringcodec/utf8.h
+++ b/source/stringcodec/utf8.h
@@ -6,7 +6,7 @@
 namespace Msp {
 namespace StringCodec {
 
-class Utf8: public Codec
+class Utf8: public StandardCodec<Utf8>
 {
 public:
 	class Encoder: public Codec::Encoder
@@ -14,9 +14,9 @@ public:
 	public:
 		Encoder(ErrorMode em = THROW_ON_ERROR): 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
@@ -24,13 +24,12 @@ public:
 	public:
 		Decoder(ErrorMode em = THROW_ON_ERROR): 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 = THROW_ON_ERROR): 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 StringCodec