X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fchset.h;h=6b92092838641f40057cd6a311c9169184bfd72f;hb=d2574b7d8e2716d3d3aea92df6576bd01c421a6c;hp=ebdbdbfe601daed4221546cdd74db1ef61ec8411;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/chset.h b/src/chset.h
index ebdbdbfe60..6b92092838 100644
--- a/src/chset.h
+++ b/src/chset.h
@@ -15,8 +15,10 @@
 
 #include <map>
 #include <utility>
+#include <string>
 
-#include "LString.h"
+
+namespace lyx {
 
 /// a class for mapping char strings such as "\^{A}" to the integer value
 class CharacterSet {
@@ -29,22 +31,25 @@ public:
 	 * and parses it. This function is only intended to be
 	 * called once.
 	 */
-	bool loadFile(string const & charset);
+	bool loadFile(std::string const & charset);
 	/// return the name of the current charset
-	string const & getName() const;
+	std::string const & getName() const;
 	/**
 	 * Return the encoded charset value of the given string.
 	 *
 	 * The bool value is false if an encoding could not be found
 	 * in this charset, and true otherwise.
 	 */
-	std::pair<bool, int> const encodeString(string const &) const;
+	std::pair<bool, int> const encodeString(std::string const &) const;
 private:
 	/// charset name
-	string name_;
+	std::string name_;
 	///
-	typedef std::map<string, unsigned char> Cdef;
+	typedef std::map<std::string, unsigned char> Cdef;
 	/// mapping from string representation to encoded value
 	Cdef map_;
 };
+
+} // namespace lyx
+
 #endif