cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / encoding.C

diff --git a/src/encoding.C b/src/encoding.C
index 4ef0bd9ead7cc4f2cad8484fd5affb22d6419a0e..96182834e4e3e986668acffd0067c7301d028551 100644 (file)
--- a/src/encoding.C
+++ b/src/encoding.C
@@ -23,6 +23,8 @@ using std::strtol;
 #endif
 
 using std::endl;
+using std::string;
+
 
 Encodings encodings;
 
@@ -246,7 +248,7 @@ unsigned char const arabic_start = 0xc1;
 } // namespace anon
 
 
-bool Encodings::IsComposeChar_hebrew(unsigned char c)
+bool Encodings::isComposeChar_hebrew(unsigned char c)
 {
        return c <= 0xd2 && c >= 0xc0 &&
                c != 0xce && c != 0xd0;
@@ -266,7 +268,7 @@ bool Encodings::is_arabic_special(unsigned char c)
                 c == 0xe9;
 }
 
-bool Encodings::IsComposeChar_arabic(unsigned char c)
+bool Encodings::isComposeChar_arabic(unsigned char c)
 {
        return c >= 0xeb && c <= 0xf2;
 }
@@ -278,7 +280,7 @@ bool Encodings::is_arabic(unsigned char c)
 }
 
 
-unsigned char Encodings::TransformChar(unsigned char c,
+unsigned char Encodings::transformChar(unsigned char c,
                                      Encodings::Letter_Form form)
 {
        if (!is_arabic(c))
@@ -334,7 +336,7 @@ void Encodings::read(string const & filename)
                        string const name = lex.getString();
                        lex.next();
                        string const latexname = lex.getString();
-                       lyxerr[Debug::INIT] << "Reading encoding " << name << endl;
+                       lyxerr[Debug::INFO] << "Reading encoding " << name << endl;
                        Uchar table[256];
                        for (unsigned int i = 0; i < 256; ++i) {
                                lex.next();