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

diff --git a/src/chset.C b/src/chset.C
index 3c783e09df..ed8ee462b5 100644
--- a/src/chset.C
+++ b/src/chset.C
@@ -12,15 +12,23 @@
 #include <config.h>
 
 #include "chset.h"
-#include "support/filetools.h"
-#include "support/lyxlib.h"
+
 #include "debug.h"
 
+#include "support/convert.h"
+#include "support/filetools.h"
+
 #include <boost/regex.hpp>
 
 #include <fstream>
 
-using namespace lyx::support;
+
+namespace lyx {
+
+using support::libFileSearch;
+
+using boost::regex;
+using boost::smatch;
 
 using std::endl;
 using std::getline;
@@ -28,14 +36,7 @@ using std::make_pair;
 
 using std::ifstream;
 using std::pair;
-
-using boost::regex;
-
-#ifndef USE_INCLUDED_STRING
-using boost::smatch;
-#else
-using boost::cmatch;
-#endif
+using std::string;
 
 
 bool CharacterSet::loadFile(string const & fname)
@@ -50,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
@@ -65,14 +66,10 @@ bool CharacterSet::loadFile(string const & fname)
 	// without the use of a keyword table.
 	regex reg("^([12][0-9][0-9])[ \t]+\"([^ ]+)\".*");
 	while (getline(ifs, line)) {
-#ifndef USE_INCLUDED_STRING
 		smatch sub;
-#else
-		cmatch sub;
-#endif
-		if (regex_match(STRCONV(line), sub, reg)) {
-			int const n = atoi(STRCONV(sub.str(1)));
-			string const str = STRCONV(sub.str(2));
+		if (regex_match(line, sub, reg)) {
+			int const n = convert<int>(sub.str(1));
+			string const str = sub.str(2);
 			if (lyxerr.debugging(Debug::KBMAP))
 				lyxerr << "Chardef: " << n
 				       << " to [" << str << ']' << endl;
@@ -105,3 +102,6 @@ string const & CharacterSet::getName() const
 {
 	return name_;
 }
+
+
+} // namespace lyx