X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstringcodec%2Fiso646fi.cpp;fp=source%2Fstringcodec%2Fiso646fi.cpp;h=ee7705b36898caec0af5d5b81724076828a8559a;hb=02794ef3620d0d9cc3b8f1c0d8f2995c825fdf4f;hp=b6aa883df43f387c553564552b79243a060aa4c7;hpb=b011b17393069d86790b2291a759280e15c75a0f;p=libs%2Fcore.git

diff --git a/source/stringcodec/iso646fi.cpp b/source/stringcodec/iso646fi.cpp
index b6aa883..ee7705b 100644
--- a/source/stringcodec/iso646fi.cpp
+++ b/source/stringcodec/iso646fi.cpp
@@ -26,7 +26,7 @@ const int mapping[map_size*2]=
 namespace Msp {
 namespace StringCodec {
 
-void Iso646Fi::Encoder::encode_char(UnicodeChar ch, string &buf)
+void Iso646Fi::Encoder::encode_char(unichar ch, string &buf)
 {
 	int tch = transform_mapping_or_direct(mapping, map_size, ch, false);
 	if(tch<0 || tch>0x7F)
@@ -35,13 +35,13 @@ void Iso646Fi::Encoder::encode_char(UnicodeChar ch, string &buf)
 		buf += tch;
 }
 
-void Iso646Fi::Encoder::transliterate(UnicodeChar, string &buf)
+void Iso646Fi::Encoder::transliterate(unichar, string &buf)
 {
 	buf += '?';
 }
 
 
-UnicodeChar Iso646Fi::Decoder::decode_char(const string &str, string::const_iterator &i)
+unichar Iso646Fi::Decoder::decode_char(const string &str, string::const_iterator &i)
 {
 	if(i==str.end())
 		return error("No input");
@@ -49,7 +49,7 @@ UnicodeChar Iso646Fi::Decoder::decode_char(const string &str, string::const_iter
 	unsigned char ch = *i;
 	int tch = (ch<=0x7F ? transform_mapping_or_direct(mapping, map_size, ch, true) : -1);
 
-	UnicodeChar result;
+	unichar result;
 	if(tch==-1)
 		result = error("Undefined ISO-646-FI character");
 	else