Applied Angus patch to compile on DEC C++ and to avoid name clashes

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 9d2a7cbd87c4950d2f84249f95e4dd544308f9b3..2d58f3376979853a041509d421a35fad6d1bbf6b 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -262,9 +262,11 @@ public:
        ///
        string const getIncludeonlyList(char delim = ',');
        ///
-       std::vector<std::pair<string,string> > const getBibkeyList();
+       std::vector<std::pair<string, string> > const getBibkeyList();
        ///
        struct TocItem {
+               TocItem(LyXParagraph * p, int d, string const & s)
+                       : par(p), depth(d), str(s) {}
                ///
                LyXParagraph * par;
                ///
@@ -272,15 +274,12 @@ public:
                ///
                string str;
        };
-       /// The different content list types.
-       enum TocType {
-               TOC_TOC = 0, ///< Table of Contents
-               TOC_LOF, ///< List of Figures
-               TOC_LOT, ///< List of Tables
-               TOC_LOA ///< List of Algorithms
-       };
        ///
-       std::vector<std::vector<TocItem> > const getTocList() const;
+       typedef std::vector<TocItem> SingleList;
+       ///
+       typedef std::map<string, SingleList> Lists;
+       ///
+       Lists const getLists() const;
        ///
        std::vector<string> const getLabelList();
 
@@ -339,26 +338,17 @@ private:
        void DocBookHandleFootnote(std::ostream & os,
                                   LyXParagraph * & par, int depth);
 #endif
-       ///
+       /// Open SGML/XML tag.
         void sgmlOpenTag(std::ostream & os, int depth,
                         string const & latexname) const;
-        ///
+        /// Closes SGML/XML tag.
         void sgmlCloseTag(std::ostream & os, int depth,
                          string const & latexname) const;
        ///
        void LinuxDocError(LyXParagraph * par, int pos,
                           string const & message);
         ///
-       void SimpleLinuxDocOnePar(std::ostream & os, LyXParagraph * par,
-                                 int desc_on, int depth);
-
-       /// LinuxDoc.
-       void push_tag(std::ostream & os, string const & tag,
-                     int & pos, char stack[5][3]);
-       
-       /// LinuxDoc.
-       void pop_tag(std::ostream & os, string const & tag,
-                    int & pos, char stack[5][3]);
+       void SimpleLinuxDocOnePar(std::ostream & os, LyXParagraph * par, int depth);
 
        /// is save needed
        mutable bool lyx_clean;