citation patch from Angus

[lyx.git] / src / chset.C

diff --git a/src/chset.C b/src/chset.C
index 66cfb09b1b41f79a68ef10d6eec61fa80a5e610b..cf3a3b1c4434174569c263b7e1f941039201a100 100644 (file)
--- a/src/chset.C
+++ b/src/chset.C
@@ -5,7 +5,6 @@
 #endif
 
 #include <fstream>
-using std::ifstream;
 
 #include "chset.h"
 #include "support/filetools.h"
@@ -13,10 +12,16 @@ using std::ifstream;
 #include "support/LSubstring.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
@@ -57,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;