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

diff --git a/src/chset.C b/src/chset.C
index c52158e166..ed8ee462b5 100644
--- a/src/chset.C
+++ b/src/chset.C
@@ -22,7 +22,10 @@
 
 #include <fstream>
 
-using lyx::support::libFileSearch;
+
+namespace lyx {
+
+using support::libFileSearch;
 
 using boost::regex;
 using boost::smatch;
@@ -48,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
@@ -99,3 +102,6 @@ string const & CharacterSet::getName() const
 {
 	return name_;
 }
+
+
+} // namespace lyx