lyx2lyx/lyx_1_6.py: fixes for r26882 as promised

[lyx.git] / src / DocIterator.h

diff --git a/src/DocIterator.h b/src/DocIterator.h
index 0c8eec3165ddb3820dfad7f3f8ed87e06906754d..5e157ef9072c05d79134608758d7c18141989d9e 100644 (file)
--- a/src/DocIterator.h
+++ b/src/DocIterator.h
@@ -212,13 +212,13 @@ public:
        bool fixIfBroken();
 
        /// find index of CursorSlice with &cell() == &cell (or -1 if not found)
-       idx_type find(MathData const & cell) const;
+       int find(MathData const & cell) const;
        /// find index of CursorSlice with inset() == inset (or -1 of not found)
-       idx_type find(InsetMath const * inset) const;
-       /// cut off CursorSlices with index > above and store cut off slices in cut
-       void cutOff(idx_type above, std::vector<CursorSlice> & cut);
+       int find(Inset const * inset) const;
+       /// cut off CursorSlices with index > above and store cut off slices in cut.
+       void cutOff(int above, std::vector<CursorSlice> & cut);
        /// cut off CursorSlices with index > above
-       void cutOff(idx_type above);
+       void cutOff(int above);
        /// push CursorSlices on top
        void append(std::vector<CursorSlice> const & x);
        /// push one CursorSlice on top and set its index and position
@@ -309,6 +309,13 @@ bool operator<=(DocIterator const & p, DocIterator const & q)
 }
 
 
+inline 
+bool operator>=(DocIterator const & p, DocIterator const & q)
+{
+       return !(p < q);
+}
+
+
 // The difference to a ('non stable') DocIterator is the removed
 // (overwritten by 0...) part of the CursorSlice data items. So this thing
 // is suitable for external storage, but not for iteration as such.