ws changes mostly

[lyx.git] / src / cursor_slice.h

diff --git a/src/cursor_slice.h b/src/cursor_slice.h
index f50820549a31ce59b620c0eb837088bffcbad93b..06414cfc4f2d3f00b6bddd179542ff82cdd1f1f6 100644 (file)
--- a/src/cursor_slice.h
+++ b/src/cursor_slice.h
@@ -43,7 +43,7 @@ public:
        /// type for cell number in inset
        typedef size_t idx_type;
        /// type for paragraph numbers positions within a cell
-       typedef lyx::par_type par_type;
+       typedef lyx::pit_type pit_type;
        /// type for cursor positions within a cell
        typedef lyx::pos_type pos_type;
        /// type for row indices
@@ -64,10 +64,10 @@ public:
        idx_type & idx() { return idx_; }
        /// return the last cell in this inset
        idx_type lastidx() const { return nargs() - 1; }
-       /// return the paragraph this cursor is in
-       par_type par() const { return par_; }
-       /// set the paragraph this cursor is in
-       par_type & par() { return par_; }
+       /// return the offset of the paragraph this cursor is in
+       pit_type pit() const { return pit_; }
+       /// set the offset of the paragraph this cursor is in
+       pit_type & pit() { return pit_; }
        /// increments the paragraph this cursor is in
        void incrementPar();
        /// increments the paragraph this cursor is in
@@ -97,7 +97,9 @@ public:
        /// see comment for the member
        bool & boundary() { return boundary_; }
        ///
-       LyXText * text() const;
+       LyXText * text();
+       ///
+       LyXText const * text() const;
        ///
        UpdatableInset * asUpdatableInset() const;
        ///
@@ -122,7 +124,7 @@ private:
        /// cell index of a position in this inset
        idx_type idx_;
        /// paragraph in this cell (used by texted)
-       par_type par_;
+       pit_type pit_;
        /// true of 'pit' was properly initialized
        bool pit_valid_;
        /// position in this cell
@@ -153,5 +155,7 @@ bool operator!=(CursorSlice const &, CursorSlice const &);
 bool operator<(CursorSlice const &, CursorSlice const &);
 /// test for order
 bool operator>(CursorSlice const &, CursorSlice const &);
+/// test for order
+bool operator<=(CursorSlice const &, CursorSlice const &);
 
 #endif