don't copy if a reference is fine

[lyx.git] / src / encoding.C

diff --git a/src/encoding.C b/src/encoding.C
index f28aad4d84a4a16e652b42791acd46a6f41734cd..118b6a6a84dcadcb81812d65d0cfab4f5b0e0882 100644 (file)
--- a/src/encoding.C
+++ b/src/encoding.C
@@ -266,7 +266,7 @@ unsigned char Encodings::TransformChar(unsigned char c,
        if (!is_arabic(c))
                return c;
 
-       if (lyxrc.font_norm == "iso10646-1")
+       if (lyxrc.font_norm_type == LyXRC::ISO_10646_1)
                return arabic_table2[c-arabic_start][form];
        else
                return arabic_table[c-arabic_start][form >> 1];
@@ -308,19 +308,19 @@ void Encodings::read(string const & filename)
 
        LyXLex lex(encodingtags, et_last - 1);
        lex.setFile(filename);
-       while (lex.IsOK()) {
+       while (lex.isOK()) {
                switch (lex.lex()) {
                case et_encoding:
                {
                        lex.next();
-                       string name = lex.GetString();
+                       string const name = lex.getString();
                        lex.next();
-                       string latexname = lex.GetString();
+                       string const latexname = lex.getString();
                        lyxerr[Debug::INIT] << "Reading encoding " << name << endl;
                        Uchar table[256];
                        for (unsigned int i = 0; i < 256; ++i) {
                                lex.next();
-                               string tmp = lex.GetString();
+                               string const tmp = lex.getString();
                                table[i] = ::strtol(tmp.c_str(), 0 , 16);
                        }
                        encodinglist[name] = Encoding(name, latexname, table);