X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fchset.h;h=90d9affad48156848b3a92da9195fa17f87d0373;hb=f65b7ff4ab2fe8ad0d9196c231064240e3fde81f;hp=17f08193fe7dcf4318fe25e8437eeab5dee62f6a;hpb=35584afc1162dec2cf9fff79305e95cb3b75aefb;p=lyx.git

diff --git a/src/chset.h b/src/chset.h
index 17f08193fe..90d9affad4 100644
--- a/src/chset.h
+++ b/src/chset.h
@@ -6,39 +6,26 @@
 #pragma interface
 #endif
 
+#include <map>
+#include <utility>
+
 #include "LString.h"
 
 ///
 class CharacterSet {
 public:
 	///
-	CharacterSet();
-	///
-	~CharacterSet();
-	
+	bool loadFile(string const &);
 	///
-	bool loadFile(const string&);
+	string const & getName() const;
 	///
-	string getName();
-	///
-	bool encodeString(string&);
+	std::pair<bool, int> const encodeString(string const &) const;
 private:
 	///
 	string name_;
-	
-	///
-	struct Cdef {
-		///
-		unsigned char ic;
-		///
-		string str;
-		///
-		Cdef *next;
-	};
-	
 	///
-	Cdef *map_;
+	typedef std::map<string, unsigned char> Cdef;
 	///
-	void freeMap();
+	Cdef map_;
 };
 #endif