X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fchset.C;h=2815485bf16d60108bb78784eee91429a96496fd;hb=98c966c64594611e469313314abd1e59524adb4a;hp=a6ac394b4be33c1a47b4d3ad55709251fe9b2acd;hpb=4820fdd44f4f708ac1364f6a67b7a85a66be7fd0;p=lyx.git

diff --git a/src/chset.C b/src/chset.C
index a6ac394b4b..2815485bf1 100644
--- a/src/chset.C
+++ b/src/chset.C
@@ -23,10 +23,11 @@ bool CharacterSet::loadFile(string const & fname)
 {
 	map_.clear();
 	name_.erase();
-	
-	if (fname.empty() || fname == "ascii") 
-		return true;	// ascii 7-bit
-	
+
+	// ascii 7-bit
+	if (fname.empty() || fname == "ascii")
+		return true;
+
 	// open definition file
 	lyxerr[Debug::KBMAP]
 		<< "Reading character set file " << fname << ".cdef" << endl;
@@ -37,14 +38,14 @@ bool CharacterSet::loadFile(string const & fname)
 		return true;		// no definition, use 7-bit ascii
 	}
 	name_ = fname;
-	
+
 	string line;
 	// Ok, I'll be the first to admit that this is probably not
 	// the fastest way to parse the cdef files, but I though it
 	// was a bit neat. Anyway it is wrong to use the lyxlex parse
-	// without the use of a keyword table.     
+	// without the use of a keyword table.
 	LRegex reg("^([12][0-9][0-9])[ \t]+\"([^ ]+)\".*");
-	while(getline(ifs, line)) {
+	while (getline(ifs, line)) {
 		if (reg.exact_match(line)) {
 			LRegex::SubMatches const & sub = reg.exec(line);
 			int const n = lyx::atoi(line.substr(sub[1].first,
@@ -70,7 +71,7 @@ pair<bool, int> const CharacterSet::encodeString(string const & str) const
 	Cdef::const_iterator cit = map_.find(str);
 	if (cit != map_.end()) {
 		ret =  true;
-		val = (*cit).second;
+		val = cit->second;
 	}
 	lyxerr[Debug::KBMAP] << "   "
 			     << (ret ? "yes we" : "no we don't")