X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fpariterator.C;h=90199a702b379ef444312431976fd0079fcf65bc;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=217a64a4d93d767df793fa323bf93a8e66a37a3d;hpb=fc06c3ea10017011d022f0f921c787422f4798de;p=lyx.git

diff --git a/src/pariterator.C b/src/pariterator.C
index 217a64a4d9..90199a702b 100644
--- a/src/pariterator.C
+++ b/src/pariterator.C
@@ -18,8 +18,8 @@
 
 #include "insets/inset.h"
 
-using lyx::par_type;
 
+namespace lyx {
 
 ///
 /// ParIterator
@@ -53,41 +53,56 @@ 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--()
 {
+#ifdef WITH_WARNINGS
 #warning look here
+#endif
 //	DocIterator::backwardPar();
 	return *this;
 }
+#endif
 
 
 Paragraph & ParIterator::operator*() const
 {
-	return text()->getPar(par());
+	return const_cast<Paragraph&>(text()->getPar(pit()));
 }
 
 
-par_type ParIterator::pit() const
+pit_type ParIterator::pit() const
 {
-	return par();
+	return DocIterator::pit();
 }
 
 
 Paragraph * ParIterator::operator->() const
 {
-	return &text()->getPar(par());
+	return const_cast<Paragraph*>(&text()->getPar(pit()));
 }
 
 
-par_type ParIterator::outerPar() const
+pit_type ParIterator::outerPar() const
 {
-	return bottom().par();
+	return bottom().pit();
 }
 
 
 ParagraphList & ParIterator::plist() const
 {
-	return text()->paragraphs();
+	return const_cast<ParagraphList&>(text()->paragraphs());
 }
 
 
@@ -103,7 +118,7 @@ bool operator!=(ParIterator const & iter1, ParIterator const & iter2)
 }
 
 
-DocIterator makeDocIterator(ParIterator const & par, lyx::pos_type pos)
+DocIterator makeDocIterator(ParIterator const & par, pos_type pos)
 {
 	DocIterator dit(par);
 	dit.pos() = pos;
@@ -136,13 +151,13 @@ ParConstIterator & ParConstIterator::operator++()
 
 Paragraph const & ParConstIterator::operator*() const
 {
-	return text()->getPar(par());
+	return text()->getPar(pit());
 }
 
 
 Paragraph const * ParConstIterator::operator->() const
 {
-	return &text()->getPar(par());
+	return &text()->getPar(pit());
 }
 
 
@@ -164,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)
 {
@@ -176,3 +193,6 @@ ParConstIterator par_const_iterator_end(InsetBase const & inset)
 {
 	return ParConstIterator(doc_iterator_end(const_cast<InsetBase &>(inset)));
 }
+
+
+} // namespace lyx