* Full author contact details are available in file CREDITS.
*/
-
#include <config.h>
-
#include "pariterator.h"
#include "ParagraphList_fwd.h"
#include "insets/inset.h"
-using lyx::par_type;
+using lyx::pit_type;
+
///
/// ParIterator
}
+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 text()->getPar(pit());
}
-par_type ParIterator::pit() const
+pit_type ParIterator::pit() const
{
- return par();
+ return pit();
}
Paragraph * ParIterator::operator->() const
{
- return &text()->getPar(par());
+ return &text()->getPar(pit());
}
-par_type ParIterator::outerPar() const
+pit_type ParIterator::outerPar() const
{
- return bottom().par();
+ return bottom().pit();
}
return !(iter1 == iter2);
}
-DocIterator
-makeDocIterator(ParIterator const & par, lyx::pos_type pos)
+
+DocIterator makeDocIterator(ParIterator const & par, lyx::pos_type pos)
{
DocIterator dit(par);
dit.pos() = pos;
return dit;
}
+
+
///
/// ParConstIterator
///
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());
}
}
+#ifdef WITH_WARNINGS
#warning const correctness!
+#endif
ParConstIterator par_const_iterator_begin(InsetBase const & inset)
{