clone NVI, other small stuff

[lyx.git] / src / pariterator.C

diff --git a/src/pariterator.C b/src/pariterator.C
index a047b60242311c84c877ce0597ddf21971650dd4..c4d027f540c742f2b9c0471b08d10750d1f0245d 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,11 +20,12 @@
 
 using lyx::par_type;
 
+
 ///
 /// ParIterator
 ///
 
-ParIterator::ParIterator(DocumentIterator const & cur) : DocumentIterator(cur)
+ParIterator::ParIterator(DocIterator const & cur) : DocIterator(cur)
 {}
 
 
@@ -43,7 +42,7 @@ ParIterator par_iterator_end(InsetBase & inset)
 
 
 ParIterator::ParIterator(ParIterator const & pi)
-       : DocumentIterator(DocumentIterator(pi))
+       : DocIterator(DocIterator(pi))
 {}
 
 
@@ -54,11 +53,27 @@ ParIterator & ParIterator::operator++()
 }
 
 
+ParIterator ParIterator::operator++(int)
+{
+       ParIterator tmp(*this);
+       forwardPar();
+       return tmp;
+}
+
+
+#if 0
+// Unused member functions. Also having this makes ParIterator not be
+// an forward iterator anymore. So unless we change that, this function
+// should not be compiled/used. (Lgb)
 ParIterator & ParIterator::operator--()
 {
-//     DocumentIterator::backwardPar();
+#ifdef WITH_WARNINGS
+#warning look here
+#endif
+//     DocIterator::backwardPar();
        return *this;
 }
+#endif
 
 
 Paragraph & ParIterator::operator*() const
@@ -93,7 +108,7 @@ ParagraphList & ParIterator::plist() const
 
 bool operator==(ParIterator const & iter1, ParIterator const & iter2)
 {
-       return DocumentIterator(iter1) == DocumentIterator(iter2);
+       return DocIterator(iter1) == DocIterator(iter2);
 }
 
 
@@ -102,32 +117,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(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;
 }
 
@@ -152,7 +169,7 @@ ParagraphList const & ParConstIterator::plist() const
 
 bool operator==(ParConstIterator const & iter1, ParConstIterator const & iter2)
 {
-       return DocumentIterator(iter1) == DocumentIterator(iter2);
+       return DocIterator(iter1) == DocIterator(iter2);
 }
 
 
@@ -162,7 +179,9 @@ bool operator!=(ParConstIterator const & iter1, ParConstIterator const & iter2)
 }
 
 
+#ifdef WITH_WARNINGS
 #warning const correctness!
+#endif
 
 ParConstIterator par_const_iterator_begin(InsetBase const & inset)
 {