X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fchset.C;h=3d8f1e891fe5b6bc0fe20b5dff14bd2f841e11d5;hb=53c5edb99e5566fd7c0a1192a697b7b7796919d8;hp=399f941a697d15873912e2aa8d6204f1c70d17ec;hpb=85798535a19919e82cc94a177a8414c542a9c5bf;p=lyx.git

diff --git a/src/chset.C b/src/chset.C
index 399f941a69..3d8f1e891f 100644
--- a/src/chset.C
+++ b/src/chset.C
@@ -10,16 +10,19 @@
 #include "support/filetools.h"
 #include "support/LRegex.h"
 #include "support/LSubstring.h"
+#include "support/lyxlib.h"
 #include "debug.h"
 
 using std::ifstream;
+using std::getline;
+using std::pair;
 using std::make_pair;
 using std::endl;
 
 bool CharacterSet::loadFile(string const & fname)
 {
 	map_.clear();
-	name_.clear();
+	name_.erase();
 	
 	if (fname.empty() || fname == "ascii") 
 		return true;	// ascii 7-bit
@@ -27,7 +30,7 @@ bool CharacterSet::loadFile(string const & fname)
 	// open definition file
 	lyxerr[Debug::KBMAP]
 		<< "Reading character set file " << fname << ".cdef" << endl;
-	string filename = LibFileSearch("kbd", fname.c_str(), "cdef");
+	string filename = LibFileSearch("kbd", fname, "cdef");
 	ifstream ifs(filename.c_str());
 	if (!ifs) {
 		lyxerr << "Unable to open character set file" << endl;
@@ -46,8 +49,8 @@ bool CharacterSet::loadFile(string const & fname)
 	while(getline(ifs, line)) {
 		if (reg.exact_match(line)) {
 			LRegex::SubMatches const & sub = reg.exec(line);
-			n = atoi(line.substr(sub[1].first,
-					     sub[1].second).c_str());
+			n = lyx::atoi(line.substr(sub[1].first,
+						  sub[1].second));
 			str = LSubstring(line, sub[2].first, sub[2].second);
 			if (lyxerr.debugging(Debug::KBMAP))
 				lyxerr << "Chardef: " << n
@@ -60,7 +63,7 @@ bool CharacterSet::loadFile(string const & fname)
 }
 
 
-pair<bool, int> CharacterSet::encodeString(string & str) const
+pair<bool, int> const CharacterSet::encodeString(string const & str) const
 {
 	lyxerr[Debug::KBMAP] << "Checking if we know [" << str << "]" << endl;
 	bool ret = false;