X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftrans.h;h=6311e74def6b01cb20f86b934ca9bc9c4fe6900c;hb=65ca7003ba47b7348610393a9a0d2d309b4e9702;hp=f53738ad9ef7a4f5471ac96c162b0a146b0b8b50;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/trans.h b/src/trans.h
index f53738ad9e..6311e74def 100644
--- a/src/trans.h
+++ b/src/trans.h
@@ -14,11 +14,10 @@
 #ifndef TRANS_H
 #define TRANS_H
 
+#include "trans_decl.h"
+
 #include <map>
 
-#include "tex-accent.h"
-#include "LString.h"
-#include "trans_decl.h"
 
 class LyXLex;
 
@@ -35,36 +34,36 @@ public:
 	~Trans();
 
 	///
-	int Load(string const & language);
+	int Load(std::string const & language);
 	///
 	bool IsDefined() const;
 	///
-	string const & GetName() const;
+	std::string const & GetName() const;
 	///
-	string const process(char, TransManager &);
+	std::string const process(char, TransManager &);
 	///
 	bool isAccentDefined(tex_accent, KmodInfo &) const;
 
 private:
 	///
-	void AddDeadkey(tex_accent, string const &);
+	void AddDeadkey(tex_accent, std::string const &);
 	///
 	void FreeKeymap();
 	///
 	int Load(LyXLex &);
 	///
-	string const & Match(unsigned char c);
+	std::string const & Match(unsigned char c);
 	///
 	void InsertException(KmodException & exclist, char c,
-			     string const & data, bool = false,
+			     std::string const & data, bool = false,
 			     tex_accent = TEX_NOACCENT);
 	///
 	void FreeException(KmodException & exclist);
 
 	///
-	string name_;
+	std::string name_;
 	///
-	std::map<int, string> keymap_;
+	std::map<int, std::string> keymap_;
 	///
 	std::map<int, KmodInfo> kmod_list_;
 };
@@ -72,13 +71,13 @@ private:
 
 ///
 inline
-string const & Trans::Match(unsigned char c)
+std::string const & Trans::Match(unsigned char c)
 {
-	std::map<int, string>::iterator it = keymap_.find(c);
+	std::map<int, std::string>::iterator it = keymap_.find(c);
 	if (it != keymap_.end()) {
 		return it->second;
 	}
-	static string dummy;
+	static std::string dummy;
 	return dummy;
 }