X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParIterator.h;h=f5e74ca8dc4f5d7271a52cc6bc79c53f29813327;hb=105e0dfe2910e0bbd13857dabff84bfadda156c4;hp=b45c0fa5fd9f1c8024958ad60b001f43ea2b1bed;hpb=e0d54dd3b497b78094ea16ab0f38ccdc8c1642e2;p=lyx.git

diff --git a/src/ParIterator.h b/src/ParIterator.h
index b45c0fa5fd..f5e74ca8dc 100644
--- a/src/ParIterator.h
+++ b/src/ParIterator.h
@@ -45,7 +45,7 @@ public:
 	///
 	ParIterator(ParIterator const &);
 	///
-	ParIterator(DocIterator const &);
+	explicit ParIterator(DocIterator const &);
 
 	/// This really should be implemented...
 	//ParIterator & operator=(ParIterator const &);
@@ -71,18 +71,21 @@ public:
 };
 
 
-DocIterator makeDocIterator(ParIterator const &, pos_type);
-
 ParIterator par_iterator_begin(Inset & inset);
 
 ParIterator par_iterator_end(Inset & inset);
 
 
 ///
-bool operator==(ParIterator const & iter1, ParIterator const & iter2);
+//bool operator==(ParIterator const & it1, ParIterator const & it2);
 
-///
-bool operator!=(ParIterator const & iter1, ParIterator const & iter2);
+// FIXME: Unfortunately operator!=(ParIterator &, ParIterator &) is
+// implemented with operator!=(DocIterator &, DocIterator &) that gives
+// false if the positions are different, even if the pars are the same.
+// So ultimately it's a bug in operator!=(ParIterator &, ParIterator &)
+// I'd say (nevertheless, I would be reluctant to change it, because I
+// fear that some part of the code could rely on this "bug". --Alfredo
+//bool operator!=(ParIterator const & it1, ParIterator const & it2);
 
 
 class ParConstIterator : public std::iterator<std::forward_iterator_tag,
@@ -91,12 +94,13 @@ class ParConstIterator : public std::iterator<std::forward_iterator_tag,
 {
 public:
 	///
-	ParConstIterator(): DocIterator() {}
+	ParConstIterator() : DocIterator() {}
 	///
 	ParConstIterator(ParConstIterator const &);
 	///
-	ParConstIterator(DocIterator const &);
+	explicit ParConstIterator(DocIterator const &);
 	///
+	void push_back(Inset const &);
 
 	ParConstIterator & operator++();
 	///
@@ -109,11 +113,9 @@ public:
 	ParagraphList const & plist() const;
 };
 
-bool operator==(ParConstIterator const & iter1,
-		ParConstIterator const & iter2);
+//bool operator==(ParConstIterator const & it1, ParConstIterator const & it2);
 
-bool operator!=(ParConstIterator const & iter1,
-		ParConstIterator const & iter2);
+//bool operator!=(ParConstIterator const & it1, ParConstIterator const & it2);
 
 
 ParConstIterator par_const_iterator_begin(Inset const & inset);