Rename UnicodeChar to unichar

diff --git a/source/stringcodec/ascii.cpp b/source/stringcodec/ascii.cpp
index 84e44fcb6899f4c8bbe7cc4538ab08a1ccf95dcc..9867049a14b6ea03be91d3f4724d97b0b728c080 100644 (file)
--- a/source/stringcodec/ascii.cpp
+++ b/source/stringcodec/ascii.cpp
@@ -21,7 +21,7 @@ const char *translit_katakana[0x60]=
 namespace Msp {
 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;
        }

diff --git a/source/stringcodec/ascii.h b/source/stringcodec/ascii.h
index 91f903115e3497e46a54516b9335ac9993523c75..163448b60875d214c9c8d936e81b779f2d3fab96 100644 (file)
--- a/source/stringcodec/ascii.h
+++ b/source/stringcodec/ascii.h
@@ -14,9 +14,9 @@ public:
        public:
                Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em) { }
 
-               virtual void encode_char(UnicodeChar, std::string &);
+               virtual void encode_char(unichar, std::string &);
        private:
-               virtual void transliterate(UnicodeChar, std::string &);
+               virtual void transliterate(unichar, std::string &);
        };
 
        class Decoder: public Codec::Decoder
@@ -24,7 +24,7 @@ public:
        public:
                Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
 
-               virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
+               virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
        virtual const char *get_name() const { return "ASCII"; }

diff --git a/source/stringcodec/codec.cpp b/source/stringcodec/codec.cpp
index ed54ac938b33e6fbf12e763dccd615706696468a..b7c600d74d6fbf0c70ccfd5fed9b766bd96a1c56 100644 (file)
--- a/source/stringcodec/codec.cpp
+++ b/source/stringcodec/codec.cpp
@@ -47,7 +47,7 @@ string Codec::Encoder::encode(const ustring &str)
        return buf;
 }
 
-void Codec::Encoder::error(UnicodeChar ch, string &buf, const string &msg)
+void Codec::Encoder::error(unichar ch, string &buf, const string &msg)
 {
        switch(err_mode)
        {
@@ -65,7 +65,7 @@ void Codec::Decoder::decode(const string &str, ustring &buf)
 {
        for(string::const_iterator i=str.begin(); i!=str.end();)
        {
-               UnicodeChar c = decode_char(str, i);
+               unichar c = decode_char(str, i);
                if(c!=-1)
                        buf += c;
        }
@@ -78,7 +78,7 @@ ustring Codec::Decoder::decode(const string &str)
        return buf;
 }
 
-UnicodeChar Codec::Decoder::error(const string &msg)
+unichar Codec::Decoder::error(const string &msg)
 {
        switch(err_mode)
        {

diff --git a/source/stringcodec/codec.h b/source/stringcodec/codec.h
index a307e2ec8acc3a784d1f57ce9d7ca4516dfff4fc..eec1e4bddb092a80a03574aa6207c30df53150ea 100644 (file)
--- a/source/stringcodec/codec.h
+++ b/source/stringcodec/codec.h
@@ -7,9 +7,9 @@
 namespace Msp {
 namespace StringCodec {
 
-typedef int UnicodeChar;
+typedef int unichar;
 
-typedef std::basic_string<UnicodeChar> ustring;
+typedef std::basic_string<unichar> ustring;
 
 enum ErrorMode
 {
@@ -58,7 +58,7 @@ public:
 
                /** Encodes a single unicode character.  If the character can't be
                represented in this encoding, error() should be called. */
-               virtual void encode_char(UnicodeChar ch, std::string &buf) = 0;
+               virtual void encode_char(unichar ch, std::string &buf) = 0;
 
                /** Encodes a unicode string.  This is equivalent to calling encode_char
                for each character in the string with the same buffer. */
@@ -79,11 +79,11 @@ public:
                THROW_ON_ERROR: throws CodecError(msg)
                IGNORE_ERRORS: does nothing
                TRANSLITERATE: calls transliterate(ch, buf) */
-               void error(UnicodeChar ch, std::string &buf, const std::string &msg);
+               void error(unichar ch, std::string &buf, const std::string &msg);
 
                /** Attempts to produce an alternative encoding for a unicode character.
                Typically this includes dropping accent marks or romanizing letters. */
-               virtual void transliterate(UnicodeChar ch, std::string &buf) = 0;
+               virtual void transliterate(unichar ch, std::string &buf) = 0;
        };
 
        /**
@@ -105,7 +105,7 @@ public:
                state change sequence was decoded but no character followed it.  If
                invalid input is encountered, the error() function should be called and
                the iterator advanced only if it doesn't throw. */
-               virtual UnicodeChar decode_char(const std::string &str, std::string::const_iterator &i) = 0;
+               virtual unichar decode_char(const std::string &str, std::string::const_iterator &i) = 0;
 
                /** Decodes a string. */
                virtual void decode(const std::string &str, ustring &buf);
@@ -122,7 +122,7 @@ public:
                THROW_ON_ERROR: throws CodecError(msg)
                IGNORE_ERRORS: returns -1
                TRANSLITERATE: return 0xFFFE */
-               UnicodeChar error(const std::string &msg);
+               unichar error(const std::string &msg);
        };
 
 protected:

diff --git a/source/stringcodec/iso2022jp.cpp b/source/stringcodec/iso2022jp.cpp
index 564892febfdc0e394b1a5f3ba9dc6bbcc83e07bd..985451280f42cfd79496963a95716dd59b3d717d 100644 (file)
--- a/source/stringcodec/iso2022jp.cpp
+++ b/source/stringcodec/iso2022jp.cpp
@@ -8,7 +8,7 @@ using namespace std;
 namespace Msp {
 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)
        {
@@ -68,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);
@@ -82,7 +82,7 @@ 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");
@@ -91,7 +91,7 @@ UnicodeChar Iso2022Jp::Decoder::decode_char(const string &str, string::const_ite
        {
                string::const_iterator j = i;
 
-               UnicodeChar result = -1;
+               unichar result = -1;
                if(*j==033)
                {
                        unsigned escape = 0;

diff --git a/source/stringcodec/iso2022jp.h b/source/stringcodec/iso2022jp.h
index 73ffec3e71eda5a158798cc37bbb803ba4d5623c..91f0166e19a5e0e6f533304c46dba6a5ee679e78 100644 (file)
--- a/source/stringcodec/iso2022jp.h
+++ b/source/stringcodec/iso2022jp.h
@@ -24,12 +24,12 @@ public:
        public:
                Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em), mode(ASCII) { }
 
-               virtual void encode_char(UnicodeChar, std::string &);
+               virtual void encode_char(unichar, std::string &);
                virtual void sync(std::string &);
                virtual void reset();
        private:
                void switch_mode(Mode, std::string &);
-               virtual void transliterate(UnicodeChar, std::string &);
+               virtual void transliterate(unichar, std::string &);
        };
 
        class Decoder: public Codec::Decoder
@@ -41,7 +41,7 @@ public:
        public:
                Decoder(ErrorMode =THROW_ON_ERROR);
 
-               virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
+               virtual unichar decode_char(const std::string &, std::string::const_iterator &);
                virtual void reset();
        private:
                void switch_mode(Mode);

diff --git a/source/stringcodec/iso646fi.cpp b/source/stringcodec/iso646fi.cpp
index b6aa883df43f387c553564552b79243a060aa4c7..ee7705b36898caec0af5d5b81724076828a8559a 100644 (file)
--- 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

diff --git a/source/stringcodec/iso646fi.h b/source/stringcodec/iso646fi.h
index 1767ca8e842021ff75f2a7e675a475c50b204db5..f61a49febc72bb8d6b36a7ce265e763a6cf574f1 100644 (file)
--- a/source/stringcodec/iso646fi.h
+++ b/source/stringcodec/iso646fi.h
@@ -14,9 +14,9 @@ public:
        public:
                Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em) { }
 
-               virtual void encode_char(UnicodeChar, std::string &);
+               virtual void encode_char(unichar, std::string &);
        private:
-               virtual void transliterate(UnicodeChar, std::string &);
+               virtual void transliterate(unichar, std::string &);
        };
 
        class Decoder: public Codec::Decoder
@@ -24,7 +24,7 @@ public:
        public:
                Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
 
-               virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
+               virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
        virtual const char *get_name() const { return "ISO-646-FI"; }

diff --git a/source/stringcodec/iso88591.cpp b/source/stringcodec/iso88591.cpp
index 19c1b8908131ec443d091f00685db282a0401986..cdb5f484a2f7532d1987828971dc37336c69f83e 100644 (file)
--- a/source/stringcodec/iso88591.cpp
+++ b/source/stringcodec/iso88591.cpp
@@ -5,7 +5,7 @@ using namespace std;
 namespace Msp {
 namespace StringCodec {
 
-void Iso88591::Encoder::encode_char(UnicodeChar ch, string &buf)
+void Iso88591::Encoder::encode_char(unichar ch, string &buf)
 {
        if(ch<0 || ch>0xFF)
                return error(ch, buf, "Can't express character in ISO-8859-1");
@@ -13,13 +13,13 @@ void Iso88591::Encoder::encode_char(UnicodeChar ch, string &buf)
        buf += ch;
 }
 
-void Iso88591::Encoder::transliterate(UnicodeChar, string &buf)
+void Iso88591::Encoder::transliterate(unichar, string &buf)
 {
        buf += '?';
 }
 
 
-UnicodeChar Iso88591::Decoder::decode_char(const string &str, string::const_iterator &i)
+unichar Iso88591::Decoder::decode_char(const string &str, string::const_iterator &i)
 {
        if(i==str.end())
                return error("No input");

diff --git a/source/stringcodec/iso88591.h b/source/stringcodec/iso88591.h
index 060a6d4efc19850c09068881572fbe46a83e8aa2..806bdb1de7d1420c701d5e99dd6ae4d08447e0c1 100644 (file)
--- a/source/stringcodec/iso88591.h
+++ b/source/stringcodec/iso88591.h
@@ -14,9 +14,9 @@ public:
        public:
                Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em) { }
 
-               virtual void encode_char(UnicodeChar, std::string &);
+               virtual void encode_char(unichar, std::string &);
        private:
-               virtual void transliterate(UnicodeChar, std::string &);
+               virtual void transliterate(unichar, std::string &);
        };
 
        class Decoder: public Codec::Decoder
@@ -24,7 +24,7 @@ public:
        public:
                Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
 
-               virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
+               virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
        virtual const char *get_name() const { return "ISO-8859-1"; }

diff --git a/source/stringcodec/iso885915.cpp b/source/stringcodec/iso885915.cpp
index 8e121adda4068a636222936dac3bd9c2a2b23c99..3e71f753afcfdfdc6ce1c57c75378cb1f01c9cad 100644 (file)
--- a/source/stringcodec/iso885915.cpp
+++ b/source/stringcodec/iso885915.cpp
@@ -25,7 +25,7 @@ const int mapping[map_size*2]=
 namespace Msp {
 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)
@@ -35,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");
@@ -49,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

diff --git a/source/stringcodec/iso885915.h b/source/stringcodec/iso885915.h
index e92eb08edda7f24d62ebe783044e3352a7992bf5..f52fdac9e802a8c9e5d386d43316086e59751b36 100644 (file)
--- a/source/stringcodec/iso885915.h
+++ b/source/stringcodec/iso885915.h
@@ -14,9 +14,9 @@ public:
        public:
                Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em) { }
 
-               virtual void encode_char(UnicodeChar, std::string &);
+               virtual void encode_char(unichar, std::string &);
        private:
-               virtual void transliterate(UnicodeChar, std::string &);
+               virtual void transliterate(unichar, std::string &);
        };
 
        class Decoder: public Codec::Decoder
@@ -24,7 +24,7 @@ public:
        public:
                Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
 
-               virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
+               virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
        virtual const char *get_name() const { return "ISO-8859-15"; }

diff --git a/source/stringcodec/jisx0201.cpp b/source/stringcodec/jisx0201.cpp
index f6a69ad2330cbb0160d55294215f864277bce2bf..307a681fdbcea1a42f8a4bed5b021e67a687ddb7 100644 (file)
--- a/source/stringcodec/jisx0201.cpp
+++ b/source/stringcodec/jisx0201.cpp
@@ -5,7 +5,7 @@ using namespace std;
 namespace Msp {
 namespace StringCodec {
 
-void JisX0201::Encoder::encode_char(UnicodeChar ch, string &buf)
+void JisX0201::Encoder::encode_char(unichar ch, string &buf)
 {
        if(ch>=0 && ch<=0x7F && ch!=0x5C && ch!=0x7E)
                buf += ch;
@@ -19,19 +19,19 @@ void JisX0201::Encoder::encode_char(UnicodeChar ch, string &buf)
                error(ch, buf, "Can't express character in JIS X 0201");
 }
 
-void JisX0201::Encoder::transliterate(UnicodeChar, string &buf)
+void JisX0201::Encoder::transliterate(unichar, string &buf)
 {
        buf += '?';
 }
 
 
-UnicodeChar JisX0201::Decoder::decode_char(const string &str, string::const_iterator &i)
+unichar JisX0201::Decoder::decode_char(const string &str, string::const_iterator &i)
 {
        if(i==str.end())
                return error("No input");
 
        unsigned char ch = *i;
-       UnicodeChar result;
+       unichar result;
        if(ch==0x5C)
                result = 0xA5;
        else if(ch==0x7E)

diff --git a/source/stringcodec/jisx0201.h b/source/stringcodec/jisx0201.h
index 2ad0112d21916237f66b6e2001099601991b7190..7a7223ee7cd3aed7f1b9271a45f74517899dcab4 100644 (file)
--- a/source/stringcodec/jisx0201.h
+++ b/source/stringcodec/jisx0201.h
@@ -14,9 +14,9 @@ public:
        public:
                Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em) { }
 
-               virtual void encode_char(UnicodeChar, std::string &);
+               virtual void encode_char(unichar, std::string &);
        private:
-               virtual void transliterate(UnicodeChar, std::string &);
+               virtual void transliterate(unichar, std::string &);
        };
 
        class Decoder: public Codec::Decoder
@@ -24,7 +24,7 @@ public:
        public:
                Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
 
-               virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
+               virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
        virtual const char *get_name() const { return "JIS X 0201"; }

diff --git a/source/stringcodec/jisx0208.cpp b/source/stringcodec/jisx0208.cpp
index 7df625422b27ff140aeeae8ce771db65e03cc661..6f07d05aac044065146d5d806a3ee30847309c78 100644 (file)
--- 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,13 +19,13 @@ 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");
@@ -34,7 +34,7 @@ UnicodeChar JisX0208::Decoder::decode_char(const string &str, string::const_iter
        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();

diff --git a/source/stringcodec/jisx0208.h b/source/stringcodec/jisx0208.h
index 4fb85a2658d8a8ce5c7ea692974ee2284be4701a..81b39f2104ca5c638fd967b1baaa91abdb03a8b0 100644 (file)
--- a/source/stringcodec/jisx0208.h
+++ b/source/stringcodec/jisx0208.h
@@ -19,9 +19,9 @@ public:
        public:
                Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em) { }
 
-               virtual void encode_char(UnicodeChar, std::string &);
+               virtual void encode_char(unichar, std::string &);
        private:
-               virtual void transliterate(UnicodeChar, std::string &);
+               virtual void transliterate(unichar, std::string &);
        };
 
        class Decoder: public Codec::Decoder
@@ -29,7 +29,7 @@ public:
        public:
                Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
 
-               virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
+               virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
        virtual const char *get_name() const { return "JIS X 0208"; }
@@ -49,8 +49,8 @@ struct Kuten
        operator bool() { return ku!=0 && ten!=0; }
 };
 
-extern UnicodeChar jisx0208_to_ucs(Kuten);
-extern Kuten ucs_to_jisx0208(UnicodeChar);
+extern unichar jisx0208_to_ucs(Kuten);
+extern Kuten ucs_to_jisx0208(unichar);
 
 } // namespace StringCodec
 } // namespace Msp

diff --git a/source/stringcodec/utf8.cpp b/source/stringcodec/utf8.cpp
index 4d3cea50dab27d33fc8030b18e484c0e620466dc..f56ba546064ee0c234f8d47af5a2d4fc25d0fb04 100644 (file)
--- a/source/stringcodec/utf8.cpp
+++ b/source/stringcodec/utf8.cpp
@@ -5,7 +5,7 @@ using namespace std;
 namespace Msp {
 namespace StringCodec {
 
-void Utf8::Encoder::encode_char(UnicodeChar ch, string &buf)
+void Utf8::Encoder::encode_char(unichar ch, string &buf)
 {
        if(ch<0 || ch>0x10FFFF)
                return error(ch, buf, "Can't express character in UTF-8");
@@ -35,20 +35,20 @@ void Utf8::Encoder::encode_char(UnicodeChar ch, string &buf)
        }
 }
 
-void Utf8::Encoder::transliterate(UnicodeChar, string &buf)
+void Utf8::Encoder::transliterate(unichar, string &buf)
 {
        buf.append("\357\277\275", 3);  // � U+FFFE Replacement Character
 }
 
 
-UnicodeChar Utf8::Decoder::decode_char(const string &str, string::const_iterator &i)
+unichar Utf8::Decoder::decode_char(const string &str, string::const_iterator &i)
 {
        if(i==str.end())
                return error("No input");
 
        if((*i&0xC0)==0x80)
        {
-               UnicodeChar result = error("UTF-8 tail byte found when expecting head");
+               unichar result = error("UTF-8 tail byte found when expecting head");
                ++i;
                return result;
        }
@@ -61,7 +61,7 @@ UnicodeChar Utf8::Decoder::decode_char(const string &str, string::const_iterator
 
                string::const_iterator j = i;
 
-               UnicodeChar result = (*j++)&(mask-1);
+               unichar result = (*j++)&(mask-1);
 
                unsigned k;
                for(k=1; (k<bytes && j!=str.end() && (*j&0xC0)==0x80); ++k)

diff --git a/source/stringcodec/utf8.h b/source/stringcodec/utf8.h
index b976291b23cc1d0c3990e5de05e25e56abaeced3..cb4924aeeed36b0960668e08f315c70bbc86663e 100644 (file)
--- a/source/stringcodec/utf8.h
+++ b/source/stringcodec/utf8.h
@@ -14,9 +14,9 @@ public:
        public:
                Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em) { }
 
-               virtual void encode_char(UnicodeChar, std::string &);
+               virtual void encode_char(unichar, std::string &);
        private:
-               virtual void transliterate(UnicodeChar, std::string &);
+               virtual void transliterate(unichar, std::string &);
        };
 
        class Decoder: public Codec::Decoder
@@ -24,7 +24,7 @@ public:
        public:
                Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
 
-               virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
+               virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
        virtual const char *get_name() const { return "UTF-8"; }

diff --git a/source/stringcodec/windows1252.cpp b/source/stringcodec/windows1252.cpp
index dc03172ce42063df056a005b6025e9d94e7cba77..531860bca47331a94f2dcae77be1f240573ac209 100644 (file)
--- a/source/stringcodec/windows1252.cpp
+++ b/source/stringcodec/windows1252.cpp
@@ -18,7 +18,7 @@ unsigned short table[32]=
 namespace Msp {
 namespace StringCodec {
 
-void Windows1252::Encoder::encode_char(UnicodeChar ch, string &buf)
+void Windows1252::Encoder::encode_char(unichar ch, string &buf)
 {
        if((ch>=0 && ch<=0x7F) || (ch>=0xA0 && ch<=0xFF))
                buf += ch;
@@ -35,19 +35,19 @@ void Windows1252::Encoder::encode_char(UnicodeChar ch, string &buf)
        }
 }
 
-void Windows1252::Encoder::transliterate(UnicodeChar, string &buf)
+void Windows1252::Encoder::transliterate(unichar, string &buf)
 {
        buf += '?';
 }
 
 
-UnicodeChar Windows1252::Decoder::decode_char(const string &str, string::const_iterator &i)
+unichar Windows1252::Decoder::decode_char(const string &str, string::const_iterator &i)
 {
        if(i==str.end())
                return error("No input");
 
        int ch = static_cast<unsigned char>(*i);
-       UnicodeChar result;
+       unichar result;
        if(ch>=0x80 && ch<=0x9F)
        {
                result = table[ch-0x80];

diff --git a/source/stringcodec/windows1252.h b/source/stringcodec/windows1252.h
index e764965f6a882e6a5d21da672c4a7207529897e8..b10071cad07dcbf703b6fc564b6aae239336e0c8 100644 (file)
--- a/source/stringcodec/windows1252.h
+++ b/source/stringcodec/windows1252.h
@@ -14,9 +14,9 @@ public:
        public:
                Encoder(ErrorMode em = THROW_ON_ERROR): Codec::Encoder(em) { }
 
-               virtual void encode_char(UnicodeChar, std::string &);
+               virtual void encode_char(unichar, std::string &);
        private:
-               virtual void transliterate(UnicodeChar, std::string &);
+               virtual void transliterate(unichar, std::string &);
        };
 
        class Decoder: public Codec::Decoder
@@ -24,7 +24,7 @@ public:
        public:
                Decoder(ErrorMode em = THROW_ON_ERROR): Codec::Decoder(em) { }
 
-               virtual UnicodeChar decode_char(const std::string &, std::string::const_iterator &);
+               virtual unichar decode_char(const std::string &, std::string::const_iterator &);
        };
 
        virtual const char *get_name() const { return "Windows-1252"; }