Changed InsetText * in InsetCollapsable to be a InsetText.

[lyx.git] / src / lyxparagraph.h

diff --git a/src/lyxparagraph.h b/src/lyxparagraph.h
index 1b4a6ce28f17faa0d72ef731de68acfc52998f0a..aacc6f2c4e315748c94c751322a8869e3b669a57 100644 (file)
--- a/src/lyxparagraph.h
+++ b/src/lyxparagraph.h
@@ -35,11 +35,13 @@ class BufferView;
 
 // I dare you to enable this and help me find all the bugs that then show
 // up. (Lgb)
-//#define NEW_INSETS 1
+#define NEW_INSETS 1
+#define NO_PEXTRA 1
 
 /// A LyXParagraph holds all text, attributes and insets in a text paragraph
 class LyXParagraph  {
 public:
+#ifndef NO_PEXTRA_REALLY
        ///
        enum PEXTRA_TYPE {
                ///
@@ -60,6 +62,7 @@ public:
                ///
                MINIPAGE_ALIGN_BOTTOM
        };
+#endif
        ///
        enum META_KIND {
 #ifndef NEW_INSETS
@@ -261,23 +264,31 @@ public:
        
        ///
        char itemdepth;
-
+#ifdef NEW_INSETS
+private:
+#endif
        ///
-       LyXParagraph * next;
+       LyXParagraph * next_;
        ///
-       LyXParagraph * previous;
-
+       LyXParagraph * previous_;
+public:
         /// 
         InsetBibKey * bibkey;  // ale970302
 
+       ///
+       void next(LyXParagraph *);
        /** these function are able to hide closed footnotes
         */
-       LyXParagraph * Next();
-       
+       LyXParagraph * next();
+       ///
+       LyXParagraph const * next() const;
+
+       ///
+       void previous(LyXParagraph *);
        ///
-       LyXParagraph * Previous();
+       LyXParagraph * previous();
        ///
-       LyXParagraph const * Previous() const;
+       LyXParagraph const * previous() const;
 
 #ifndef NEW_INSETS
        /** these function are able to hide open and closed footnotes
@@ -330,8 +341,10 @@ public:
                           LyXTextClass::LayoutList::size_type new_layout);
        ///
        int GetFirstCounter(int i) const;
+#ifndef NEW_INSETS
        ///
        size_type Last() const;
+#endif
        ///
        void Erase(size_type pos);
        /** the flag determines wether the layout should be copied
@@ -457,6 +470,7 @@ public:
            first paragraph keeps information  about layoutparameters, */
        bool IsDummy() const;
 #endif
+#ifndef NO_PEXTRA_REALLY
         /* If I set a PExtra Indent on one paragraph of a ENV_LIST-TYPE
            I have to set it on each of it's elements */
        ///
@@ -464,6 +478,7 @@ public:
                           string const & width, string const & widthp);
        ///
         void UnsetPExtraType(BufferParams const &);
+#endif
        ///
        bool linuxDocConvertChar(char c, string & sgml_string);
 private: