X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fstringcodec%2Fiso2022jp.cpp;h=1e5bf90ee590fb068276a1287e3b0fe5c3a9f4ff;hb=3e3868860d4f4ca1bbe55fbf271c804307cea3c9;hp=d9c7ceac147b0e08ccd3e8c3c684dce6cb947722;hpb=b42ed73a1b241c0e93ee03c43c4584b41c549bac;p=libs%2Fcore.git

diff --git a/source/stringcodec/iso2022jp.cpp b/source/stringcodec/iso2022jp.cpp
index d9c7cea..1e5bf90 100644
--- a/source/stringcodec/iso2022jp.cpp
+++ b/source/stringcodec/iso2022jp.cpp
@@ -1,9 +1,3 @@
-/* $Id$
-
-This file is part of libmspstrings
-Copyright © 2006-2007 Mikko Rasa
-Distributed under the LGPL
-*/
 #include "ascii.h"
 #include "iso2022jp.h"
 #include "jisx0201.h"
@@ -12,9 +6,9 @@ Distributed under the LGPL
 using namespace std;
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
-void Iso2022Jp::Encoder::encode_char(UnicodeChar ch, string &buf)
+void Iso2022Jp::Encoder::encode_char(unichar ch, string &buf)
 {
 	if(ch>=0 && ch<=0x7F && ch!=0x5C && ch!=0x7E)
 	{
@@ -74,7 +68,7 @@ void Iso2022Jp::Encoder::switch_mode(Mode m, string &buf)
 	}
 }
 
-void Iso2022Jp::Encoder::transliterate(UnicodeChar, string &buf)
+void Iso2022Jp::Encoder::transliterate(unichar, string &buf)
 {
 	if(mode!=ASCII)
 		switch_mode(ASCII, buf);
@@ -88,16 +82,16 @@ Iso2022Jp::Decoder::Decoder(ErrorMode em):
 	dec(new Ascii::Decoder)
 { }
 
-UnicodeChar Iso2022Jp::Decoder::decode_char(const string &str, string::const_iterator &i)
+unichar Iso2022Jp::Decoder::decode_char(const string &str, string::const_iterator &i)
 {
 	if(i==str.end())
-		return error("No input");
+		return -1;
 
 	while(i!=str.end())
 	{
 		string::const_iterator j = i;
 
-		UnicodeChar result = -1;
+		unichar result = -1;
 		if(*j==033)
 		{
 			unsigned escape = 0;
@@ -156,5 +150,5 @@ void Iso2022Jp::Decoder::switch_mode(Mode m)
 	}
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp