X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParIterator.cpp;h=1ddf3479860dc8d27d96302b3bf4f28ce32f44eb;hb=439338850831ee099dbceb3fc5d3438e3e7c77cc;hp=5c0660d452103a6a83f98c49e7628fb77e992e45;hpb=e69b723bf9d2e2d8bbd855cac164be4a1a24035e;p=lyx.git

diff --git a/src/ParIterator.cpp b/src/ParIterator.cpp
index 5c0660d452..1ddf347986 100644
--- a/src/ParIterator.cpp
+++ b/src/ParIterator.cpp
@@ -3,7 +3,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author unknown
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -20,32 +20,34 @@
 
 namespace lyx {
 
-///
-/// ParIterator
-///
+//////////////////////////////////////////////////////////////////////////
+//
+// ParIterator
+//
+//////////////////////////////////////////////////////////////////////////
 
-ParIterator::ParIterator(DocIterator const & cur)
-	: DocIterator(cur)
+ParIterator::ParIterator(DocIterator const & dit)
+	: DocIterator(dit)
+{}
+
+
+ParIterator::ParIterator(ParIterator const & pi)
+	: DocIterator(DocIterator(pi))
 {}
 
 
 ParIterator par_iterator_begin(Inset & inset)
 {
-	return ParIterator(doc_iterator_begin(inset));
+	return ParIterator(doc_iterator_begin(&inset.buffer(), &inset));
 }
 
 
 ParIterator par_iterator_end(Inset & inset)
 {
-	return ParIterator(doc_iterator_end(inset));
+	return ParIterator(doc_iterator_end(&inset.buffer(), &inset));
 }
 
 
-ParIterator::ParIterator(ParIterator const & pi)
-	: DocIterator(DocIterator(pi))
-{}
-
-
 ParIterator & ParIterator::operator++()
 {
 	forwardPar();
@@ -104,18 +106,16 @@ ParagraphList & ParIterator::plist() const
 }
 
 
-DocIterator makeDocIterator(ParIterator const & par, pos_type pos)
-{
-	DocIterator dit(par);
-	dit.pos() = pos;
-	return dit;
-}
-
+//////////////////////////////////////////////////////////////////////////
+//
+// ParConstIterator
+//
+//////////////////////////////////////////////////////////////////////////
 
 
-///
-/// ParConstIterator
-///
+ParConstIterator::ParConstIterator(Buffer const * buf)
+	: DocIterator(const_cast<Buffer *>(buf))
+{}
 
 
 ParConstIterator::ParConstIterator(DocIterator const & dit)
@@ -128,6 +128,12 @@ ParConstIterator::ParConstIterator(ParConstIterator const & pi)
 {}
 
 
+void ParConstIterator::push_back(Inset const & inset)
+{
+	DocIterator::push_back(CursorSlice(const_cast<Inset &>(inset)));
+}
+
+
 ParConstIterator & ParConstIterator::operator++()
 {
 	DocIterator::forwardPar();
@@ -167,18 +173,4 @@ bool operator!=(ParConstIterator const & iter1, ParConstIterator const & iter2)
 #endif
 
 
-// FIXME: const correctness!
-
-ParConstIterator par_const_iterator_begin(Inset const & inset)
-{
-	return ParConstIterator(doc_iterator_begin(const_cast<Inset &>(inset)));
-}
-
-
-ParConstIterator par_const_iterator_end(Inset const & inset)
-{
-	return ParConstIterator(doc_iterator_end(const_cast<Inset &>(inset)));
-}
-
-
 } // namespace lyx