X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstringcodec%2Fjisx0208.cpp;h=411ae2b6477c945e5d5a95da14837e42863d2591;hb=93bb92bad766d269a6bac87e00020a6158531739;hp=7df625422b27ff140aeeae8ce771db65e03cc661;hpb=056dc68dfc606a2c14126a70321045d6d9f12e0e;p=libs%2Fcore.git

diff --git a/source/stringcodec/jisx0208.cpp b/source/stringcodec/jisx0208.cpp
index 7df6254..411ae2b 100644
--- a/source/stringcodec/jisx0208.cpp
+++ b/source/stringcodec/jisx0208.cpp
@@ -7,7 +7,7 @@ using namespace std;
 namespace Msp {
 namespace StringCodec {
 
-void JisX0208::Encoder::encode_char(UnicodeChar ucs, string &buf)
+void JisX0208::Encoder::encode_char(unichar ucs, string &buf)
 {
 	unsigned short jis = ucs_to_jisx0208(ucs);
 	if(jis)
@@ -19,22 +19,22 @@ void JisX0208::Encoder::encode_char(UnicodeChar ucs, string &buf)
 		error(ucs, buf, "Can't express character in JIS X 0208");
 }
 
-void JisX0208::Encoder::transliterate(UnicodeChar, string &buf)
+void JisX0208::Encoder::transliterate(unichar, string &buf)
 {
 	buf.append("!)", 2);
 }
 
 
-UnicodeChar JisX0208::Decoder::decode_char(const string &str, string::const_iterator &i)
+unichar JisX0208::Decoder::decode_char(const string &str, string::const_iterator &i)
 {
 	if(i==str.end())
-		return error("No input");
+		return -1;
 
 	string::const_iterator j = i;
 	Kuten jis;
 	jis.ku = *j++-0x20;
 
-	UnicodeChar result;
+	unichar result;
 	if(j==str.end())
 		result = error("Incomplete JIS X 0208 character");
 	else
@@ -50,7 +50,7 @@ UnicodeChar JisX0208::Decoder::decode_char(const string &str, string::const_iter
 }
 
 
-UnicodeChar jisx0208_to_ucs(Kuten jis)
+unichar jisx0208_to_ucs(Kuten jis)
 {
 	if(jis.ku==0 || jis.ku>0x5E || jis.ten==0 || jis.ten>0x5E)
 		return 0;
@@ -58,7 +58,7 @@ UnicodeChar jisx0208_to_ucs(Kuten jis)
 	return jisx0208_to_ucs_table[jis.ku*94 + jis.ten - 95];
 }
 
-Kuten ucs_to_jisx0208(UnicodeChar c)
+Kuten ucs_to_jisx0208(unichar c)
 {
 	if(c<0 || c>0xFFFF)
 		return Kuten();