#include "pariterator.h"
-#include "ParagraphList_fwd.h"
#include "paragraph.h"
#include "lyxtext.h"
#include "insets/inset.h"
-using lyx::par_type;
+namespace lyx {
///
/// 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
// 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());
}
}
-DocIterator makeDocIterator(ParIterator const & par, lyx::pos_type pos)
+DocIterator makeDocIterator(ParIterator const & par, pos_type pos)
{
DocIterator dit(par);
dit.pos() = pos;
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());
}
{
return ParConstIterator(doc_iterator_end(const_cast<InsetBase &>(inset)));
}
+
+
+} // namespace lyx