#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;
+using lyx::support::libFileSearch;
+
+using boost::regex;
+using boost::smatch;
using std::endl;
using std::getline;
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)
// 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;
// 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;