ws changes mostly

[lyx.git] / src / dociterator.h

diff --git a/src/dociterator.h b/src/dociterator.h
index d00add62d478a4559379f282a2aa1f4de39ffadd..b5a1e80659cd622587cda55c9b86dcef605732af 100644 (file)
--- a/src/dociterator.h
+++ b/src/dociterator.h
@@ -40,7 +40,7 @@ public:
        /// type for cell number in inset
        typedef CursorSlice::idx_type idx_type;
        /// type for paragraph numbers positions within a cell
-       typedef CursorSlice::par_type par_type;
+       typedef CursorSlice::pit_type pit_type;
        /// type for cursor positions within a cell
        typedef CursorSlice::pos_type pos_type;
        /// type for row indices
@@ -81,21 +81,17 @@ public:
        /// return the last possible cell in this inset
        idx_type lastidx() const;
        /// return the paragraph this cursor is in
-       par_type par() const { return back().par(); }
+       pit_type pit() const { return back().pit(); }
        /// return the paragraph this cursor is in
-       par_type & par() { return back().par(); }
+       pit_type & pit() { return back().pit(); }
        /// return the last possible paragraph in this inset
-       par_type lastpar() const;
+       pit_type lastpit() const;
        /// return the position within the paragraph
        pos_type pos() const { return back().pos(); }
        /// return the position within the paragraph
        pos_type & pos() { return back().pos(); }
        /// return the last position within the paragraph
        pos_type lastpos() const;
-       /// return the display row of the cursor with in the top par
-       row_type crow() const;
-       /// return the display row of the cursor with in the top par
-       row_type lastcrow() const;
 
        /// return the number of embedded cells
        size_t nargs() const;
@@ -155,11 +151,15 @@ public:
        /// the row in the paragraph we're in
        Row const & textRow() const;
        ///
-       LyXText * text() const;
+       LyXText * text();
+       ///
+       LyXText const * text() const;
        ///
        InsetBase * innerInsetOfType(int code) const;
        ///
-       LyXText * innerText() const;
+       LyXText * innerText();
+       ///
+       LyXText const * innerText() const;
 
        //
        // elementary moving
@@ -185,6 +185,9 @@ public:
        /// move backward one inset
        void backwardInset();
 
+       /// are we some 'extension' (i.e. deeper nested) of the given iterator
+       bool hasPart(DocIterator const & it) const;
+
        /// output
        friend std::ostream &
        operator<<(std::ostream & os, DocIterator const & cur);