X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstringcodec%2Fascii.cpp;h=9867049a14b6ea03be91d3f4724d97b0b728c080;hb=02794ef3620d0d9cc3b8f1c0d8f2995c825fdf4f;hp=cb6281ab83e1d862e0223d2197fe22ce6f136642;hpb=967785734be5c3fc6f75da122c2d93ebbb338271;p=libs%2Fcore.git

diff --git a/source/stringcodec/ascii.cpp b/source/stringcodec/ascii.cpp
index cb6281a..9867049 100644
--- a/source/stringcodec/ascii.cpp
+++ b/source/stringcodec/ascii.cpp
@@ -19,9 +19,9 @@ const char *translit_katakana[0x60]=
 }*/
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
-void Ascii::Encoder::encode_char(UnicodeChar ch, string &buf)
+void Ascii::Encoder::encode_char(unichar ch, string &buf)
 {
 	if(ch<0 || ch>0x7F)
 		return error(ch, buf, "Can't express character in ASCII");
@@ -29,7 +29,7 @@ void Ascii::Encoder::encode_char(UnicodeChar ch, string &buf)
 	buf += ch;
 }
 
-void Ascii::Encoder::transliterate(UnicodeChar ch, string &buf)
+void Ascii::Encoder::transliterate(unichar ch, string &buf)
 {
 	if(ch>=0xC0 && ch<=0xC5)
 		buf += 'A';
@@ -88,13 +88,13 @@ void Ascii::Encoder::transliterate(UnicodeChar ch, string &buf)
 }
 
 
-UnicodeChar Ascii::Decoder::decode_char(const string &str, string::const_iterator &i)
+unichar Ascii::Decoder::decode_char(const string &str, string::const_iterator &i)
 {
 	if(i==str.end())
 		return error("No input");
 	else if(*i&0x80)
 	{
-		UnicodeChar result = error("Undefined ASCII character");
+		unichar result = error("Undefined ASCII character");
 		++i;
 		return result;
 	}
@@ -102,5 +102,5 @@ UnicodeChar Ascii::Decoder::decode_char(const string &str, string::const_iterato
 		return *i++;
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp