Change to use preffered calling of Boost.Function

[lyx.git] / src / pariterator.C

diff --git a/src/pariterator.C b/src/pariterator.C
index d864d659e739c72cf5becaecf3d68303ebf68d29..8d6fe920564c616ec9b0541b7f71194d77dc1359 100644 (file)
--- a/src/pariterator.C
+++ b/src/pariterator.C
@@ -1,4 +1,4 @@
-/* \file iterators.C
+/* \file pariterator.C
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -8,10 +8,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
-
 #include <config.h>
 
-
 #include "pariterator.h"
 
 #include "ParagraphList_fwd.h"
@@ -22,22 +20,29 @@
 
 using lyx::par_type;
 
+
 ///
 /// ParIterator
 ///
 
-ParIterator::ParIterator(DocumentIterator const & cur) : DocumentIterator(cur)
+ParIterator::ParIterator(DocIterator const & cur) : DocIterator(cur)
 {}
 
 
-ParIterator::ParIterator(InsetBase & in, par_type pit) : DocumentIterator(in)
+ParIterator par_iterator_begin(InsetBase & inset)
+{
+       return ParIterator(doc_iterator_begin(inset));
+}
+
+
+ParIterator par_iterator_end(InsetBase & inset)
 {
-       par() = pit;
+       return ParIterator(doc_iterator_end(inset));
 }
 
 
 ParIterator::ParIterator(ParIterator const & pi)
-       : DocumentIterator(DocumentIterator(pi))
+       : DocIterator(DocIterator(pi))
 {}
 
 
@@ -50,7 +55,10 @@ ParIterator & ParIterator::operator++()
 
 ParIterator & ParIterator::operator--()
 {
-//     DocumentIterator::backwardPar();
+#ifdef WITH_WARNINGS
+#warning look here
+#endif
+//     DocIterator::backwardPar();
        return *this;
 }
 
@@ -87,7 +95,7 @@ ParagraphList & ParIterator::plist() const
 
 bool operator==(ParIterator const & iter1, ParIterator const & iter2)
 {
-       return DocumentIterator(iter1) == DocumentIterator(iter2);
+       return DocIterator(iter1) == DocIterator(iter2);
 }
 
 
@@ -96,39 +104,34 @@ bool operator!=(ParIterator const & iter1, ParIterator const & iter2)
        return !(iter1 == iter2);
 }
 
-DocumentIterator
-makeDocumentIterator(ParIterator const & par, lyx::pos_type pos)
+
+DocIterator makeDocIterator(ParIterator const & par, lyx::pos_type pos)
 {
-       DocumentIterator dit(par);
+       DocIterator dit(par);
        dit.pos() = pos;
        return dit;
 }
 
+
+
 ///
 /// ParConstIterator
 ///
 
 
-ParConstIterator::ParConstIterator(InsetBase const & in, par_type pit)
-       : DocumentIterator(const_cast<InsetBase &>(in))
-{
-       par() = pit;
-}
-
-
-ParConstIterator::ParConstIterator(DocumentIterator const & dit)
-       : DocumentIterator(dit)
+ParConstIterator::ParConstIterator(DocIterator const & dit)
+       : DocIterator(dit)
 {}
 
 
 ParConstIterator::ParConstIterator(ParConstIterator const & pi)
-       : DocumentIterator(DocumentIterator(pi))
+       : DocIterator(DocIterator(pi))
 {}
 
 
 ParConstIterator & ParConstIterator::operator++()
 {
-       DocumentIterator::forwardPar();
+       DocIterator::forwardPar();
        return *this;
 }
 
@@ -153,7 +156,7 @@ ParagraphList const & ParConstIterator::plist() const
 
 bool operator==(ParConstIterator const & iter1, ParConstIterator const & iter2)
 {
-       return DocumentIterator(iter1) == DocumentIterator(iter2);
+       return DocIterator(iter1) == DocIterator(iter2);
 }
 
 
@@ -161,3 +164,19 @@ bool operator!=(ParConstIterator const & iter1, ParConstIterator const & iter2)
 {
        return !(iter1 == iter2);
 }
+
+
+#ifdef WITH_WARNINGS
+#warning const correctness!
+#endif
+
+ParConstIterator par_const_iterator_begin(InsetBase const & inset)
+{
+       return ParConstIterator(doc_iterator_begin(const_cast<InsetBase &>(inset)));
+}
+
+
+ParConstIterator par_const_iterator_end(InsetBase const & inset)
+{
+       return ParConstIterator(doc_iterator_end(const_cast<InsetBase &>(inset)));
+}