X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fchset.C;h=ed8ee462b502203144b737d0757b80bbdab36333;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=20e28319c5bb4b3b01cbb0ff5178bfb123de6015;hpb=6a1167adab9c33e0800cf1e7b314344a21cf93fe;p=lyx.git

diff --git a/src/chset.C b/src/chset.C
index 20e28319c5..ed8ee462b5 100644
--- a/src/chset.C
+++ b/src/chset.C
@@ -1,32 +1,42 @@
-#include <config.h>
+/**
+ * \file chset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#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 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
+namespace lyx {
+
+using support::libFileSearch;
+
+using boost::regex;
 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)
@@ -41,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
@@ -56,17 +66,13 @@ 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 = lyx::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;
+				       << " to [" << str << ']' << endl;
 			map_[str] = n;
 		}
 	}
@@ -77,7 +83,7 @@ bool CharacterSet::loadFile(string const & fname)
 
 pair<bool, int> const CharacterSet::encodeString(string const & str) const
 {
-	lyxerr[Debug::KBMAP] << "Checking if we know [" << str << "]" << endl;
+	lyxerr[Debug::KBMAP] << "Checking if we know [" << str << ']' << endl;
 	bool ret = false;
 	int val = 0;
 	Cdef::const_iterator cit = map_.find(str);
@@ -87,7 +93,7 @@ pair<bool, int> const CharacterSet::encodeString(string const & str) const
 	}
 	lyxerr[Debug::KBMAP] << "   "
 			     << (ret ? "yes we" : "no we don't")
-			     <<  " know [" << str << "]" << endl;
+			     <<  " know [" << str << ']' << endl;
 	return make_pair(ret, val);
 }
 
@@ -96,3 +102,6 @@ string const & CharacterSet::getName() const
 {
 	return name_;
 }
+
+
+} // namespace lyx