X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fchset.C;h=e97330e2ff656542af8955fa7b42a7e54dca04d1;hb=33243f70037b067f90d1574b74b34f90a2ef2aa1;hp=33b94c895e4ccf92bbea57444ecabd785f5972dc;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/chset.C b/src/chset.C
index 33b94c895e..e97330e2ff 100644
--- a/src/chset.C
+++ b/src/chset.C
@@ -12,30 +12,29 @@
 #include <config.h>
 
 #include "chset.h"
+
+#include "debug.h"
+
 #include "support/filetools.h"
 #include "support/lyxlib.h"
-#include "debug.h"
 
 #include <boost/regex.hpp>
 
 #include <fstream>
 
-using namespace lyx::support;
+using lyx::support::atoi;
+using lyx::support::LibFileSearch;
 
-using std::ifstream;
-using std::getline;
-using std::pair;
-using std::make_pair;
-using std::endl;
 using boost::regex;
-using boost::regex_match;
-
-#ifndef USE_INCLUDED_STRING
 using boost::smatch;
-#else
-using boost::cmatch;
-#endif
 
+using std::endl;
+using std::getline;
+using std::make_pair;
+
+using std::ifstream;
+using std::pair;
+using std::string;
 
 
 bool CharacterSet::loadFile(string const & fname)
@@ -65,14 +64,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 = atoi(sub.str(1));
+			string const str = sub.str(2);
 			if (lyxerr.debugging(Debug::KBMAP))
 				lyxerr << "Chardef: " << n
 				       << " to [" << str << ']' << endl;