* Licence details can be found in the file COPYING.
*
* \author unknown
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
*
* Full author contact details are available in file CREDITS.
*/
#include "ParIterator.h"
-#include "Paragraph.h"
-#include "LyXText.h"
+#include "CursorSlice.h"
+#include "Text.h"
#include "insets/Inset.h"
namespace lyx {
-///
-/// ParIterator
-///
+//////////////////////////////////////////////////////////////////////////
+//
+// ParIterator
+//
+//////////////////////////////////////////////////////////////////////////
-ParIterator::ParIterator(DocIterator const & cur) : DocIterator(cur)
-{}
-
-ParIterator par_iterator_begin(InsetBase & inset)
+ParIterator par_iterator_begin(Inset & inset)
{
- return ParIterator(doc_iterator_begin(inset));
+ return ParIterator(doc_iterator_begin(&inset.buffer(), &inset));
}
-ParIterator par_iterator_end(InsetBase & inset)
+ParIterator par_iterator_end(Inset & inset)
{
- return ParIterator(doc_iterator_end(inset));
+ return ParIterator(doc_iterator_end(&inset.buffer(), &inset));
}
-ParIterator::ParIterator(ParIterator const & pi)
- : DocIterator(DocIterator(pi))
-{}
-
-
ParIterator & ParIterator::operator++()
{
forwardPar();
// should not be compiled/used. (Lgb)
ParIterator & ParIterator::operator--()
{
-#ifdef WITH_WARNINGS
-#warning look here
-#endif
+ // FIXME: look here
// DocIterator::backwardPar();
return *this;
}
Paragraph & ParIterator::operator*() const
{
- return const_cast<Paragraph&>(text()->getPar(pit()));
+ return text()->getPar(pit());
}
Paragraph * ParIterator::operator->() const
{
- return const_cast<Paragraph*>(&text()->getPar(pit()));
+ return &text()->getPar(pit());
}
ParagraphList & ParIterator::plist() const
{
- return const_cast<ParagraphList&>(text()->paragraphs());
-}
-
-
-bool operator==(ParIterator const & iter1, ParIterator const & iter2)
-{
- return DocIterator(iter1) == DocIterator(iter2);
+ return text()->paragraphs();
}
-bool operator!=(ParIterator const & iter1, ParIterator const & iter2)
-{
- return !(iter1 == iter2);
-}
+//////////////////////////////////////////////////////////////////////////
+//
+// ParConstIterator
+//
+//////////////////////////////////////////////////////////////////////////
-DocIterator makeDocIterator(ParIterator const & par, pos_type pos)
+void ParConstIterator::push_back(Inset const & inset)
{
- DocIterator dit(par);
- dit.pos() = pos;
- return dit;
+ DocIterator::push_back(CursorSlice(const_cast<Inset &>(inset)));
}
-
-///
-/// ParConstIterator
-///
-
-
-ParConstIterator::ParConstIterator(DocIterator const & dit)
- : DocIterator(dit)
-{}
-
-
-ParConstIterator::ParConstIterator(ParConstIterator const & pi)
- : DocIterator(DocIterator(pi))
-{}
-
-
ParConstIterator & ParConstIterator::operator++()
{
DocIterator::forwardPar();
return text()->paragraphs();
}
-
+#if 0
bool operator==(ParConstIterator const & iter1, ParConstIterator const & iter2)
{
- return DocIterator(iter1) == DocIterator(iter2);
+ return static_cast<DocIterator const &>(iter1) == static_cast<DocIterator 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)));
-}
-
} // namespace lyx