Extracted from r14281

[lyx.git] / src / chset.C

diff --git a/src/chset.C b/src/chset.C
index bddc529d87f1e61a4ad3eacff7c9976b079d44b4..c52158e1665abdc9e258c2e3845bda437e786239 100644 (file)
--- a/src/chset.C
+++ b/src/chset.C
@@ -15,15 +15,14 @@
 
 #include "debug.h"
 
+#include "support/convert.h"
 #include "support/filetools.h"
-#include "support/lyxlib.h"
 
 #include <boost/regex.hpp>
 
 #include <fstream>
 
-using lyx::support::atoi;
-using lyx::support::LibFileSearch;
+using lyx::support::libFileSearch;
 
 using boost::regex;
 using boost::smatch;
@@ -34,7 +33,7 @@ using std::make_pair;
 
 using std::ifstream;
 using std::pair;
-
+using std::string;
 
 
 bool CharacterSet::loadFile(string const & fname)
@@ -49,7 +48,7 @@ bool CharacterSet::loadFile(string const & fname)
        // open definition file
        lyxerr[Debug::KBMAP]
                << "Reading character set file " << fname << ".cdef" << endl;
-       string const filename = LibFileSearch("kbd", fname, "cdef");
+       string const filename = libFileSearch("kbd", fname, "cdef");
        ifstream ifs(filename.c_str());
        if (!ifs) {
                lyxerr << "Unable to open character set file" << endl;
@@ -66,7 +65,7 @@ bool CharacterSet::loadFile(string const & fname)
        while (getline(ifs, line)) {
                smatch sub;
                if (regex_match(line, sub, reg)) {
-                       int const n = atoi(sub.str(1));
+                       int const n = convert<int>(sub.str(1));
                        string const str = sub.str(2);
                        if (lyxerr.debugging(Debug::KBMAP))
                                lyxerr << "Chardef: " << n