Minor code shuffle.

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index b6666b6043e3f46465808317c8d04d39d202d75f..9fc5b9b16fa7f3780b4d7bcade0e5d71cfa33ea0 100644 (file)
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -94,7 +94,7 @@ public:
        explicit
        Paragraph(Paragraph * par);
        ///
-       Paragraph(Paragraph const &);
+       Paragraph(Paragraph const &, bool same_ids = false);
        /// the destructor removes the new paragraph from the list
        ~Paragraph();
 
@@ -150,7 +150,7 @@ public:
            proof environment */
        int getEndLabel(BufferParams const &) const;
        ///
-       Inset * InInset();
+       Inset * inInset() const;
        ///
        void setInsetOwner(Inset * i);
        ///
@@ -217,7 +217,6 @@ public:
        ///
        void setLabelWidthString(string const & s);
        ///
-       inline
        LyXTextClass::LayoutList::size_type getLayout() const;
        ///
        char getAlign() const;
@@ -322,6 +321,9 @@ public:
        /// returns -1 if inset not found
        int getPositionOfInset(Inset * inset) const;
 
+       /// some good comment here John?
+       Paragraph * getParFromID(int id) const;
+
        ///
        int stripLeadingSpaces(LyXTextClassList::size_type tclass); 
 
@@ -369,9 +371,9 @@ public:
                        return *this;
                }
                ///
-               Inset * operator*() { return (*it).inset; }
+               Inset * operator*() { return it->inset; }
                ///
-               size_type getPos() const {return (*it).pos; }
+               size_type getPos() const {return it->pos; }
                ///
                bool operator==(inset_iterator const & iter) const {
                        return it == iter.it;
@@ -384,6 +386,9 @@ public:
                ///
                InsetList::iterator it;
        };
+       ///
+       friend class inset_iterator;
+       
        ///
        inset_iterator inset_iterator_begin();
        ///