Make lyx2lyx output the new external inset format.

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index 52621056824fb03c45535e6a9c7a86975edef1ad..c89c15b787e06439330285ede006b3f86d7906fb 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -20,8 +20,6 @@
 
 #include "LString.h"
 
-#include <boost/optional.hpp>
-
 class Buffer;
 class BufferParams;
 class BufferView;
@@ -33,21 +31,11 @@ class LatexRunParams;
 class ParagraphParameters;
 class TexRow;
 class ParagraphList;
-
-// Define this if you want to try out the new storage container for
-// paragraphs. (Lgb)
-// This is non working and far from finished.
-//#define NO_STD_LIST 1
+class UpdatableInset;
 
 /// A Paragraph holds all text, attributes and insets in a text paragraph
 class Paragraph  {
 public:
-#ifdef NO_STD_LIST
-       // Remove this whan ParagraphList transition is over. (Lgb)
-       friend class ParagraphList;
-       friend class ParagraphList::iterator;
-       friend class ParagraphList::const_iterator;
-#endif
        ///
        enum META_KIND {
                /// Note that this is 1 right now to avoid
@@ -68,7 +56,7 @@ public:
        ///
        Paragraph(Paragraph const &);
        ///
-       //void operator=(Paragraph const &);
+       void operator=(Paragraph const &);
        /// the destructor removes the new paragraph from the list
        ~Paragraph();
 
@@ -118,9 +106,9 @@ public:
        void makeSameLayout(Paragraph const & par);
 
        ///
-       Inset * inInset() const;
+       UpdatableInset * inInset() const;
        ///
-       void setInsetOwner(Inset * i);
+       void setInsetOwner(UpdatableInset * inset);
        ///
        void deleteInsetsLyXText(BufferView *);
        ///
@@ -182,10 +170,11 @@ public:
        /// mark whole par as erased
        void markErased();
 
-       /// Paragraphs can contain "manual labels", for example, Description environment.
-       /// The text for this user-editable label is stored in the paragraph alongside
-       /// the text of the rest of the paragraph (the body). This function returns
-       /// the starting position of the body of the text in the paragraph.
+       /// Paragraphs can contain "manual labels", for example, Description
+       /// environment. The text for this user-editable label is stored in
+       /// the paragraph alongside the text of the rest of the paragraph
+       /// (the body). This function returns the starting position of the
+       /// body of the text in the paragraph.
        int beginningOfBody() const;
 
        ///
@@ -303,21 +292,10 @@ public:
        ParagraphParameters const & params() const;
        ///
        InsetList insetlist;
-       ///
-       //Counters & counters();
-       ///
-       void owningBuffer(Buffer const & b) {
-               buffer_.reset(&b);
-       }
+
 private:
        ///
        LyXLayout_ptr layout_;
-#ifdef NO_STD_LIST
-       Paragraph * next_par_;
-       Paragraph * prev_par_;
-#endif
-       ///
-       boost::optional<Buffer const *> buffer_;
 
        struct Pimpl;
        ///