X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fchset.h;h=adce167ab17c80b576e6a531bc69d6211d2d46ef;hb=91a2ea274e9c27f571a3cd4798d2e8ecc1b982a7;hp=6156606571c566d318bfb354eaa9cad428a8087a;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git

diff --git a/src/chset.h b/src/chset.h
index 6156606571..adce167ab1 100644
--- a/src/chset.h
+++ b/src/chset.h
@@ -1,44 +1,34 @@
 // -*- C++ -*-
-#ifndef _Chset_h_
-#define _Chset_h_
+#ifndef CHSET_H
+#define CHSET_H
 
 #ifdef __GNUG__
 #pragma interface
 #endif
 
+#include <map>
+#include <utility>
+
+using std::map;
+using std::pair;
+
 #include "LString.h"
 
 ///
 class CharacterSet {
 public:
 	///
-	CharacterSet();
-	///
-	~CharacterSet();
-	
+	bool loadFile(string const &);
 	///
-	bool loadFile(const LString&);
+	string const & getName() const;
 	///
-	LString getName();
-	///
-	bool encodeString(LString&);
+	pair<bool, int> encodeString(string &) const;
 private:
 	///
-	LString name_;
-	
-	///
-	struct Cdef {
-		///
-		unsigned char ic;
-		///
-		LString str;
-		///
-		Cdef *next;
-	};
-	
+	string name_;
 	///
-	Cdef *map_;
+	typedef map<string, unsigned char> Cdef;
 	///
-	void freeMap();
+	Cdef map_;
 };
 #endif