Remove unused font variable which caused a warning.

[lyx.git] / src / paragraph.h

diff --git a/src/paragraph.h b/src/paragraph.h
index d141f31a97bffea438f528ea76e1b33bf05340f8..318fea8caeeee55d64c3543f73de25eff2057a31 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);
        ///
@@ -260,8 +260,6 @@ public:
        void setChar(size_type pos, value_type c);
        ///
        void setFont(size_type pos, LyXFont const & font);
-       ///
-        string const getWord(size_type &) const;
        /// Returns the height of the highest font in range
        LyXFont::FONT_SIZE highestFontInRange(size_type startpos,
                                              size_type endpos) const;
@@ -270,11 +268,13 @@ public:
        ///
        void insertChar(size_type pos, value_type c, LyXFont const &);
        ///
+       bool checkInsertChar(LyXFont &);
+       ///
        void insertInset(size_type pos, Inset * inset);
        ///
        void insertInset(size_type pos, Inset * inset, LyXFont const &);
        ///
-       bool insertInsetAllowed(Inset * inset);
+       bool insetAllowed(Inset::Code code);
        ///
        Inset * getInset(size_type pos);
        ///
@@ -321,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); 
 
@@ -368,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;
@@ -383,6 +386,9 @@ public:
                ///
                InsetList::iterator it;
        };
+       ///
+       friend class inset_iterator;
+       
        ///
        inset_iterator inset_iterator_begin();
        ///