X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fdociterator.h;h=7d4c4439681589200460d00067e4be9548204599;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=fa6824b88fe3551cbae3a369d7b4ab7fb1f4b9fb;hpb=f200823716565c4c37046f32daca40eaf70223dc;p=lyx.git

diff --git a/src/dociterator.h b/src/dociterator.h
index fa6824b88f..7d4c443968 100644
--- a/src/dociterator.h
+++ b/src/dociterator.h
@@ -17,13 +17,15 @@
 #include <vector>
 #include <iosfwd>
 
+
+namespace lyx {
+
 class LyXText;
 class MathAtom;
 class Paragraph;
 class Row;
 
 
-
 // only needed for gcc 2.95, remove when support terminated
 template <typename A, typename B>
 bool ptr_cmp(A const * a, B const * b)
@@ -39,10 +41,6 @@ class DocIterator // : public std::vector<CursorSlice>
 public:
 	/// type for cell number in inset
 	typedef CursorSlice::idx_type idx_type;
-	/// type for paragraph numbers positions within a cell
-	typedef CursorSlice::pit_type pit_type;
-	/// type for cursor positions within a cell
-	typedef CursorSlice::pos_type pos_type;
 	/// type for row indices
 	typedef CursorSlice::row_type row_type;
 	/// type for col indices
@@ -178,8 +176,11 @@ public:
 	//
 	/// move on one logical position, do not descend into nested insets
 	void forwardPosNoDescend();
-	/// move on one logical position, descend into nested insets
-	void forwardPos();
+	/**
+	 * move on one logical position, descend into nested insets
+	 * skip collapsed insets if \p ignorecollapsed is true
+	 */
+	void forwardPos(bool ignorecollapsed = false);
 	/// move on one physical character or inset
 	void forwardChar();
 	/// move on one paragraph
@@ -279,8 +280,6 @@ public:
 	DocIterator asDocIterator(InsetBase * start) const;
 	///
 	size_t size() const { return data_.size(); }
-	/// type for cursor positions within a cell
-	typedef CursorSlice::pos_type pos_type;
 	///  return the position within the paragraph
 	pos_type pos() const { return data_.back().pos(); }
 	///  return the position within the paragraph
@@ -298,4 +297,7 @@ private:
 	std::vector<CursorSlice> data_;
 };
 
+
+} // namespace lyx
+
 #endif