X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fchset.C;h=ed8ee462b502203144b737d0757b80bbdab36333;hb=c4320d24cd2d29c2e77958b4a8fd44f2bd587ca7;hp=e97330e2ff656542af8955fa7b42a7e54dca04d1;hpb=44cd0fc9a1687cc63911c7f98d978594458e7813;p=lyx.git

diff --git a/src/chset.C b/src/chset.C
index e97330e2ff..ed8ee462b5 100644
--- a/src/chset.C
+++ b/src/chset.C
@@ -15,15 +15,17 @@
 
 #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;
+
+namespace lyx {
+
+using support::libFileSearch;
 
 using boost::regex;
 using boost::smatch;
@@ -49,8 +51,8 @@ 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");
-	ifstream ifs(filename.c_str());
+	support::FileName const filename = libFileSearch("kbd", fname, "cdef");
+	ifstream ifs(filename.toFilesystemEncoding().c_str());
 	if (!ifs) {
 		lyxerr << "Unable to open character set file" << endl;
 		return true;		// no definition, use 7-bit ascii
@@ -66,7 +68,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
@@ -100,3 +102,6 @@ string const & CharacterSet::getName() const
 {
 	return name_;
 }
+
+
+} // namespace lyx