fix to #241 and #300 from John

[lyx.git] / src / chset.C

diff --git a/src/chset.C b/src/chset.C
index b08adfed4dcd47a0c843e0306771774eda026e8e..2815485bf16d60108bb78784eee91429a96496fd 100644 (file)
--- a/src/chset.C
+++ b/src/chset.C
@@ -10,6 +10,7 @@
 #include "support/filetools.h"
 #include "support/LRegex.h"
 #include "support/LSubstring.h"
+#include "support/lyxlib.h"
 #include "debug.h"
 
 using std::ifstream;
@@ -22,35 +23,35 @@ 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;
-       string filename = LibFileSearch("kbd", fname.c_str(), "cdef");
+       string const filename = LibFileSearch("kbd", fname, "cdef");
        ifstream ifs(filename.c_str());
        if (!ifs) {
                lyxerr << "Unable to open character set file" << endl;
                return true;            // no definition, use 7-bit ascii
        }
        name_ = fname;
-       
-       string str;
-       int n;
+
        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);
-                       n = atoi(line.substr(sub[1].first,
-                                            sub[1].second).c_str());
-                       str = LSubstring(line, sub[2].first, sub[2].second);
+                       int const n = lyx::atoi(line.substr(sub[1].first,
+                                                 sub[1].second));
+                       string const str = LSubstring(line, sub[2].first,
+                                                     sub[2].second);
                        if (lyxerr.debugging(Debug::KBMAP))
                                lyxerr << "Chardef: " << n
                                       << " to [" << str << "]" << endl;
@@ -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")