Rename UnicodeChar to unichar

[libs/core.git] / source / stringcodec / iso885915.cpp

diff --git a/source/stringcodec/iso885915.cpp b/source/stringcodec/iso885915.cpp
index 3eccbcf91e436105d9b0e17e4367b13df3a659fe..3e71f753afcfdfdc6ce1c57c75378cb1f01c9cad 100644 (file)
--- a/source/stringcodec/iso885915.cpp
+++ b/source/stringcodec/iso885915.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspstrings
-Copyright © 2006-2007 Mikko Rasa
-Distributed under the LGPL
-*/
-
 #include "codecutils.h"
 #include "iso885915.h"
 
@@ -30,9 +23,9 @@ const int mapping[map_size*2]=
 
 
 namespace Msp {
-namespace Codecs {
+namespace StringCodec {
 
-void Iso885915::Encoder::encode_char(UnicodeChar ch, string &buf)
+void Iso885915::Encoder::encode_char(unichar ch, string &buf)
 {
        int tch = transform_mapping_or_direct(mapping, map_size, ch, false);
        if(tch<0 || tch>0xFF)
@@ -42,13 +35,13 @@ void Iso885915::Encoder::encode_char(UnicodeChar ch, string &buf)
 
 }
 
-void Iso885915::Encoder::transliterate(UnicodeChar, string &buf)
+void Iso885915::Encoder::transliterate(unichar, string &buf)
 {
        buf += '?';
 }
 
 
-UnicodeChar Iso885915::Decoder::decode_char(const string &str, string::const_iterator &i)
+unichar Iso885915::Decoder::decode_char(const string &str, string::const_iterator &i)
 {
        if(i==str.end())
                return error("No input");
@@ -56,7 +49,7 @@ UnicodeChar Iso885915::Decoder::decode_char(const string &str, string::const_ite
        unsigned char ch = *i;
        int tch = transform_mapping_or_direct(mapping, map_size, ch, true);
 
-       UnicodeChar result;
+       unichar result;
        if(tch==-1)
                result = error("Undefined ISO-8859-15 character");
        else
@@ -66,5 +59,5 @@ UnicodeChar Iso885915::Decoder::decode_char(const string &str, string::const_ite
        return result;
 }
 
-} // namespace Codecs
+} // namespace StringCodec
 } // namespace Msp