X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fencoding.C;h=118b6a6a84dcadcb81812d65d0cfab4f5b0e0882;hb=34d28f9daae536db06d6cf1a9dcf62dc0f5aa432;hp=fdc6ed4944dca22c840f894ffc11cdebc568e020;hpb=83acbbd5237373926c629855379e1df9a04209b2;p=lyx.git

diff --git a/src/encoding.C b/src/encoding.C
index fdc6ed4944..118b6a6a84 100644
--- 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];
@@ -277,7 +277,7 @@ Encoding const * Encodings::getEncoding(string const & encoding) const
 {
        	EncodingList::const_iterator it = encodinglist.find(encoding);
 	if (it != encodinglist.end())
-		return &(*it).second;
+		return &it->second;
 	else
 		return 0;
 }
@@ -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);