X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fpariterator.h;h=9f4884184e1046c91e6816abb89f295af4e07b8e;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=90e93f1842fc31b135dc2f9b678d13093b626f02;hpb=1f9d992ce0b5d33341215dc8dece45fe1b5bccf0;p=lyx.git

diff --git a/src/pariterator.h b/src/pariterator.h
index 90e93f1842..9f4884184e 100644
--- a/src/pariterator.h
+++ b/src/pariterator.h
@@ -13,6 +13,7 @@
 #define PARITERATOR_H
 
 #include "dociterator.h"
+#include "ParagraphList_fwd.h"
 
 #include "support/types.h"
 
@@ -21,10 +22,12 @@
 #include <vector>
 
 
+namespace lyx {
+
+
 
 class InsetBase;
 class LyXText;
-class ParagraphList;
 
 
 class ParIterator : public std::iterator<std::forward_iterator_tag, Paragraph>,
@@ -43,14 +46,14 @@ public:
 
 
 	///
-	ParIterator(InsetBase &, lyx::par_type pit);
+	ParIterator(InsetBase &, pit_type pit);
 	///
 	ParIterator(ParIterator const &);
 	///
 	ParIterator(DocIterator const &);
 
-	///
-	void operator=(ParIterator const &);
+	/// This really should be implemented...
+	//ParIterator & operator=(ParIterator const &);
 	///
 	ParIterator & operator++();
 	///
@@ -62,15 +65,18 @@ public:
 	///
 	Paragraph * operator->() const;
 	/// This gives us the top-most parent paragraph
-	lyx::par_type outerPar() const;
+	pit_type outerPar() const;
 	///
-	lyx::par_type pit() const;
+	pit_type pit() const;
 	///
+	/// return the paragraph this cursor is in
+	pit_type & pit() { return DocIterator::pit(); }
+
 	ParagraphList & plist() const;
 };
 
 
-DocIterator makeDocIterator(ParIterator const &, lyx::pos_type);
+DocIterator makeDocIterator(ParIterator const &, pos_type);
 
 ParIterator par_iterator_begin(InsetBase & inset);
 
@@ -89,6 +95,8 @@ class ParConstIterator : public std::iterator<std::forward_iterator_tag,
 			 public DocIterator
 {
 public:
+	///
+	ParConstIterator(): DocIterator() {}
 	///
 	ParConstIterator(ParConstIterator const &);
 	///
@@ -118,4 +126,7 @@ ParConstIterator par_const_iterator_begin(InsetBase const & inset);
 ParConstIterator par_const_iterator_end(InsetBase const & inset);
 
 
+
+} // namespace lyx
+
 #endif