remove !NEW_INSETS cruft

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 4e1eeee2ea97a0f0251331d984b06a2ea8b72303..4e6db6dc84f24a56559cc50fe51e02110e6e9aac 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -132,12 +132,7 @@ public:
        bool parseSingleLyXformat2Token(LyXLex &, LyXParagraph *& par,
                                        LyXParagraph *& return_par,
                                        string const & token, int & pos,
-                                       char & depth, LyXFont &
-#ifndef NEW_INSETS
-                                       ,LyXParagraph::footnote_flag &,
-                                       LyXParagraph::footnote_kind &
-#endif
-               );
+                                       char & depth, LyXFont &);
 private:
        /// Parse a single inset.
        void readInset(LyXLex &, LyXParagraph *& par, int & pos, LyXFont &);
@@ -265,6 +260,8 @@ public:
        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;
                ///
@@ -273,7 +270,11 @@ public:
                string str;
        };
        ///
-       std::map<string, 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();
 
@@ -318,40 +319,21 @@ public:
        /// Used when typesetting to place errorboxes.
        TexRow texrow;
 private:
-#ifndef NEW_INSETS
-        ///
-        void linuxDocHandleFootnote(std::ostream & os,
-                                   LyXParagraph * & par, int depth);
-#endif
         ///
        void DocBookHandleCaption(std::ostream & os, string & inner_tag,
                                  int depth, int desc_on,
                                  LyXParagraph * & par);
-#ifndef NEW_INSETS
-        ///
-       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;
@@ -407,11 +389,7 @@ public:
                        if (par) {
                                ++it;
                                if (it == par->inset_iterator_end()) {
-#ifndef NEW_INSETS
-                                       par = par->next_;
-#else
                                        par = par->next();
-#endif
                                        SetParagraph();
                                }
                        }
@@ -423,11 +401,7 @@ public:
                        if (par) {
                                ++it;
                                if (it == par->inset_iterator_end()) {
-#ifndef NEW_INSETS
-                                       par = par->next_;
-#else
                                        par = par->next();
-#endif
                                        SetParagraph();
                                }
                        }