X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fchset.h;h=90d9affad48156848b3a92da9195fa17f87d0373;hb=74784ee97b67490c7bb82128bff76f0e8f94a139;hp=f32fb9b047cb08242a58b8b865cd132335346c3a;hpb=0eccdd1c3613e5170deb77b22174dd0afde833e9;p=lyx.git

diff --git a/src/chset.h b/src/chset.h
index f32fb9b047..90d9affad4 100644
--- a/src/chset.h
+++ b/src/chset.h
@@ -1,44 +1,31 @@
 // -*- C++ -*-
-#ifndef _Chset_h_
-#define _Chset_h_
+#ifndef CHSET_H
+#define CHSET_H
 
 #ifdef __GNUG__
 #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