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

diff --git a/source/stringcodec/iso646fi.h b/source/stringcodec/iso646fi.h
index 8fc5e83..7ded23c 100644
--- a/source/stringcodec/iso646fi.h
+++ b/source/stringcodec/iso646fi.h
@@ -1,12 +1,12 @@
-#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
@@ -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,16 +24,15 @@ 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 "ISO-646-FI"; }
+	Iso646Fi(ErrorMode em = THROW_ON_ERROR): 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