* src/frontends/qt4/QTocDialog.C (updateGui):

[lyx.git] / src / encoding.h

diff --git a/src/encoding.h b/src/encoding.h
index 1463126c03a3c56575f2288647ebb5d0745619c3..a817cdff6c93ba62c9c89ac4b281d174853a1d6b 100644 (file)
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -20,47 +20,61 @@
 
 namespace lyx {
 
+namespace support { class FileName; }
+
 ///
 class Encoding {
 public:
        ///
        Encoding() {}
        ///
-       Encoding(std::string const & n, std::string const & l, char_type const * e)
-               : Name_(n), LatexName_(l)
+       Encoding(std::string const & n, std::string const & l,
+                std::string const & i)
+               : Name_(n), LatexName_(l), iconvName_(i)
        {
-               for (int i = 0; i < 256; ++i)
-                       encoding_table[i] = e[i];
        }
        ///
        std::string const & name() const { return Name_; }
        ///
        std::string const & latexName() const { return LatexName_; }
        ///
-       char_type ucs(char_type c) const;
+       std::string const & iconvName() const { return iconvName_; }
 private:
        ///
        std::string Name_;
        ///
        std::string LatexName_;
        ///
-       char_type encoding_table[256];
+       std::string iconvName_;
 };
 
-extern Encoding symbol_encoding;
-
 class Encodings {
 public:
        ///
        typedef std::map<std::string, Encoding> EncodingList;
+       /// iterator to iterate over all encodings.
+       /// We hide the fact that our encoding list is implemented as a map.
+       class const_iterator : public EncodingList::const_iterator {
+               typedef EncodingList::const_iterator base;
+       public:
+               const_iterator() : base() {}
+               const_iterator(base const & b) : base(b) {}
+               Encoding const & operator*() const { return base::operator*().second; }
+               Encoding const * operator->() const { return &(base::operator*().second); }
+       };
        ///
        Encodings();
        ///
-       void read(std::string const & filename);
+       void read(support::FileName const & filename);
+       /// Get encoding from LyX name \p name
+       Encoding const * getFromLyXName(std::string const & name) const;
+       /// Get encoding from LaTeX name \p name
+       Encoding const * getFromLaTeXName(std::string const & name) const;
+
        ///
-       Encoding const * getEncoding(std::string const & encoding) const;
+       const_iterator begin() const { return encodinglist.begin(); }
        ///
-       Encoding const * symbol_encoding() { return &symbol_encoding_; }
+       const_iterator end() const { return encodinglist.end(); }
 
        ///
        enum Letter_Form {
@@ -87,8 +101,6 @@ public:
 private:
        ///
        EncodingList encodinglist;
-       ///
-       Encoding symbol_encoding_;
 };
 
 extern Encodings encodings;