X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flanguage.h;h=b0eeff259dd3c62a8ee9d2007b785d920051f2bd;hb=73603ed31be3133738cb93a65dd5ead9782c7a34;hp=01e0c74b901b4308a6ed3322d95fdaee645b0eb3;hpb=8283e978f8d621041c432b9b88a476bfd567385c;p=lyx.git

diff --git a/src/language.h b/src/language.h
index 01e0c74b90..b0eeff259d 100644
--- a/src/language.h
+++ b/src/language.h
@@ -1,23 +1,23 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
+/**
+ * \file language.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Dekel Tsur
+ * \author Jürgen Vigna
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef LANGUAGE_H
 #define LANGUAGE_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include <map>
-#include "LString.h"
+#include <string>
+
 
 class Encoding;
 
@@ -27,22 +27,22 @@ public:
 	///
 	Language() : RightToLeft_(false) {}
 	///
-	Language(string const & l, string const & b, string const & d,
-		 bool rtl, Encoding const * e, string const & c,
-		 string const & o)
+	Language(std::string const & l, std::string const & b, std::string const & d,
+		 bool rtl, Encoding const * e, std::string const & c,
+		 std::string const & o)
 		: lang_(l), babel_(b), display_(d), RightToLeft_(rtl),
 		  encoding_(e), code_(c), latex_options_(o)
 		{}
 	///
-	string const & lang() const {
+	std::string const & lang() const {
 		return lang_;
 	}
 	///
-	string const & babel() const {
+	std::string const & babel() const {
 		return babel_;
 	}
 	///
-	string const & display() const {
+	std::string const & display() const {
 		return display_;
 	}
 	///
@@ -54,45 +54,43 @@ public:
 		return encoding_;
 	}
 	///
-	string const & code() const {
+	std::string const & code() const {
 		return code_;
 	}
 	///
-	string const & latex_options() const {
+	std::string const & latex_options() const {
 		return latex_options_;
 	}
 private:
 	///
-	string lang_;
+	std::string lang_;
 	///
-	string babel_;
+	std::string babel_;
 	///
-	string display_;
+	std::string display_;
 	///
 	bool RightToLeft_;
 	///
 	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 setDefaults();
+	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();
@@ -117,8 +115,5 @@ extern Language const * default_language;
 extern Language const * english_language;
 extern Language const * ignore_language;
 extern Language const * latex_language;
-#ifdef INHERIT_LANGUAGE
-extern Language const * inherit_language;
-#endif
 
 #endif