Use Gtk::ComboBoxText::clear() instead of clear_items(), which only exists in newer...

[lyx.git] / src / language.h

diff --git a/src/language.h b/src/language.h
index e1e82776923f62199b0fe152481ce91287666628..66d1d5066446e65fa21e922afcd5f960b67f377d 100644 (file)
--- a/src/language.h
+++ b/src/language.h
@@ -1,23 +1,23 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor
- *        
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
+/**
+ * \file language.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ====================================================== */
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Dekel Tsur
+ * \author Jürgen Vigna
+ *
+ * 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;
 
@@ -25,88 +25,70 @@ 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_; }
        ///
-       string const & babel() const {
-               return babel_;
-       }
+       std::string const & babel() const { return babel_; }
        ///
-       string const & display() const {
-               return display_;
-       }
+       std::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_; }
        ///
-       string const & code() const {
-               return code_;
-       }
+       std::string const & encodingStr() const { return encodingStr_; }
        ///
-       string const & latex_options() const {
-               return latex_options_;
-       }
+       std::string const & code() const { return code_; }
+       ///
+       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);
        ///
-       void setDefaults();
+       Language const * getLanguage(std::string const & language) const;
        ///
-       Language const * getLanguage(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:
        ///
        LanguageList languagelist;
@@ -116,5 +98,6 @@ extern Languages languages;
 extern Language const * default_language;
 extern Language const * english_language;
 extern Language const * ignore_language;
+extern Language const * latex_language;
 
 #endif