small changes to ButtonController usage

[lyx.git] / src / chset.C

diff --git a/src/chset.C b/src/chset.C
index b2b6a5ebe02757300af8c65f57d422823e55b044..cf3a3b1c4434174569c263b7e1f941039201a100 100644 (file)
--- a/src/chset.C
+++ b/src/chset.C
@@ -13,6 +13,7 @@
 #include "debug.h"
 
 using std::ifstream;
+using std::getline;
 using std::pair;
 using std::make_pair;
 using std::endl;
@@ -20,7 +21,7 @@ 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
@@ -61,7 +62,7 @@ bool CharacterSet::loadFile(string const & fname)
 }
 
 
-pair<bool, int> CharacterSet::encodeString(string & str) const
+pair<bool, int> CharacterSet::encodeString(string const & str) const
 {
        lyxerr[Debug::KBMAP] << "Checking if we know [" << str << "]" << endl;
        bool ret = false;