X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstringcodec%2Fiso646fi.h;h=2266c2ca06f24a081d34d3abe7be009f67b95cf0;hp=8fc5e8339fa8b3175f948a008d55f4fb9417cde8;hb=817e584903996a041692640720a5a272d847a3c7;hpb=967785734be5c3fc6f75da122c2d93ebbb338271

diff --git a/source/stringcodec/iso646fi.h b/source/stringcodec/iso646fi.h
index 8fc5e83..2266c2c 100644
--- a/source/stringcodec/iso646fi.h
+++ b/source/stringcodec/iso646fi.h
@@ -1,39 +1,38 @@
-#ifndef MSP_STRINGS_ISO646FI_H_
-#define MSP_STRINGS_ISO646FI_H_
+#ifndef MSP_STRINGCODEC_ISO646FI_H_
+#define MSP_STRINGCODEC_ISO646FI_H_
 
 #include "codec.h"
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
-class Iso646Fi: public Codec
+class Iso646Fi: public StandardCodec<Iso646Fi>
 {
 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 "ISO-646-FI"; }
+	Iso646Fi(ErrorMode em = DEFAULT): StandardCodec<Iso646Fi>(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 "ISO-646-FI"; }
 };
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp
 
 #endif