use the new sstream return non-pods as const, use string instead of char * in a lot...

[lyx.git] / src / chset.C

diff --git a/src/chset.C b/src/chset.C
index 399f941a697d15873912e2aa8d6204f1c70d17ec..b08adfed4dcd47a0c843e0306771774eda026e8e 100644 (file)
--- a/src/chset.C
+++ b/src/chset.C
@@ -13,13 +13,15 @@
 #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
@@ -60,7 +62,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;