X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flanguage.h;h=66d1d5066446e65fa21e922afcd5f960b67f377d;hb=fd2124c83dfcfeaf33b64d1d33c8ceb8d9f5f9b9;hp=1293778c588349d0413490838afe36f66693ad1f;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/language.h b/src/language.h
index 1293778c58..66d1d50664 100644
--- a/src/language.h
+++ b/src/language.h
@@ -16,7 +16,8 @@
 #define LANGUAGE_H
 
 #include <map>
-#include "support/std_string.h"
+#include <string>
+
 
 class Encoding;
 
@@ -24,84 +25,68 @@ class Encoding;
 class Language {
 public:
 	///
-	Language() : RightToLeft_(false) {}
+	Language() : rightToLeft_(false) {}
 	///
-	Language(string const & l, string const & b, string const & d,
-		 bool rtl, Encoding const * e, string const & c,
-		 string const & o)
-		: lang_(l), babel_(b), display_(d), RightToLeft_(rtl),
-		  encoding_(e), code_(c), latex_options_(o)
+	Language(std::string const & l, std::string const & b, std::string const & d,
+		 bool rtl, std::string const & es, Encoding const * e, std::string const & c,
+		 std::string const & o)
+		: lang_(l), babel_(b), display_(d), rightToLeft_(rtl),
+		  encodingStr_(es), encoding_(e), code_(c), latex_options_(o)
 		{}
 	///
-	string const & lang() const {
-		return lang_;
-	}
+	std::string const & lang() const { return lang_; }
+	///
+	std::string const & babel() const { return babel_; }
 	///
-	string const & babel() const {
-		return babel_;
-	}
+	std::string const & display() const { return display_; }
 	///
-	string const & display() const {
-		return display_;
-	}
+	bool RightToLeft() const { return rightToLeft_; }
 	///
-	bool RightToLeft() const {
-		return RightToLeft_;
-	}
+	Encoding const * encoding() const { return encoding_; }
 	///
-	Encoding const * encoding() const {
-		return encoding_;
-	}
+	std::string const & encodingStr() const { return encodingStr_; }
 	///
-	string const & code() const {
-		return code_;
-	}
+	std::string const & code() const { return code_; }
 	///
-	string const & latex_options() const {
-		return latex_options_;
-	}
+	std::string const & latex_options() const { return latex_options_; }
 private:
 	///
-	string lang_;
+	std::string lang_;
+	///
+	std::string babel_;
 	///
-	string babel_;
+	std::string display_;
 	///
-	string display_;
+	bool rightToLeft_;
 	///
-	bool RightToLeft_;
+	std::string encodingStr_;
 	///
 	Encoding const * encoding_;
 	///
-	string code_;
+	std::string code_;
 	///
-	string latex_options_;
+	std::string latex_options_;
 };
 
 class Languages
 {
 public:
 	///
-	typedef std::map<string, Language> LanguageList;
+	typedef std::map<std::string, Language> LanguageList;
 	///
 	typedef LanguageList::const_iterator const_iterator;
 	///
 	typedef LanguageList::size_type size_type;
 	///
-	void read(string const & filename);
+	void read(std::string const & filename);
 	///
-	Language const * getLanguage(string const & language) const;
+	Language const * getLanguage(std::string const & language) const;
 	///
-	size_type size() const {
-		return languagelist.size();
-	}
+	size_type size() const { return languagelist.size(); }
 	///
-	const_iterator begin() const {
-		return languagelist.begin();
-	}
+	const_iterator begin() const { return languagelist.begin(); }
 	///
-	const_iterator end() const {
-		return languagelist.end();
-	}
+	const_iterator end() const { return languagelist.end(); }
 	///
 
 private: