lyxstring compile fixes ; small stuff

[lyx.git] / src / chset.C

diff --git a/src/chset.C b/src/chset.C
index 965616d811d33f0d71811f8902a461e6ca338e6d..a6ac394b4be33c1a47b4d3ad55709251fe9b2acd 100644 (file)
--- a/src/chset.C
+++ b/src/chset.C
@@ -5,20 +5,24 @@
 #endif
 
 #include <fstream>
-using std::ifstream;
 
 #include "chset.h"
 #include "support/filetools.h"
 #include "support/LRegex.h"
 #include "support/LSubstring.h"
+#include "support/lyxlib.h"
 #include "debug.h"
 
+using std::ifstream;
+using std::getline;
+using std::pair;
 using std::make_pair;
+using std::endl;
 
 bool CharacterSet::loadFile(string const & fname)
 {
        map_.clear();
-       name_.clear();
+       name_.erase();
        
        if (fname.empty() || fname == "ascii") 
                return true;    // ascii 7-bit
@@ -26,7 +30,7 @@ bool CharacterSet::loadFile(string const & fname)
        // 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;
@@ -34,8 +38,6 @@ bool CharacterSet::loadFile(string const & fname)
        }
        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
@@ -45,9 +47,10 @@ bool CharacterSet::loadFile(string const & fname)
        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;
@@ -59,7 +62,7 @@ bool CharacterSet::loadFile(string const & fname)
 }
 
 
-pair<bool, int> CharacterSet::encodeString(string & str) const
+pair<bool, int> const CharacterSet::encodeString(string const & str) const
 {
        lyxerr[Debug::KBMAP] << "Checking if we know [" << str << "]" << endl;
        bool ret = false;