* 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 "CursorSlice.h"
#include "Text.h"
#include "insets/Inset.h"
namespace lyx {
-///
-/// ParIterator
-///
-
-ParIterator::ParIterator(DocIterator const & cur)
- : DocIterator(cur)
-{}
+//////////////////////////////////////////////////////////////////////////
+//
+// ParIterator
+//
+//////////////////////////////////////////////////////////////////////////
ParIterator par_iterator_begin(Inset & inset)
{
- return ParIterator(doc_iterator_begin(inset));
+ return ParIterator(doc_iterator_begin(&inset.buffer(), &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();
}
-DocIterator makeDocIterator(ParIterator const & par, pos_type pos)
-{
- DocIterator dit(par);
- dit.pos() = pos;
- return dit;
-}
-
+//////////////////////////////////////////////////////////////////////////
+//
+// ParConstIterator
+//
+//////////////////////////////////////////////////////////////////////////
-///
-/// ParConstIterator
-///
-
-
-ParConstIterator::ParConstIterator(DocIterator const & dit)
- : DocIterator(dit)
-{}
-
-
-ParConstIterator::ParConstIterator(ParConstIterator const & pi)
- : DocIterator(DocIterator(pi))
-{}
+void ParConstIterator::push_back(Inset const & inset)
+{
+ DocIterator::push_back(CursorSlice(const_cast<Inset &>(inset)));
+}
ParConstIterator & ParConstIterator::operator++()
#if 0
bool operator==(ParConstIterator const & iter1, ParConstIterator const & iter2)
{
- // FIXME: this makes two full copies!
- return DocIterator(iter1) == DocIterator(iter2);
+ return static_cast<DocIterator const &>(iter1) == static_cast<DocIterator const &>(iter2);
}
#endif
-// FIXME: const correctness!
-
-ParConstIterator par_const_iterator_begin(Inset const & inset)
-{
- return ParConstIterator(doc_iterator_begin(const_cast<Inset &>(inset)));
-}
-
-
-ParConstIterator par_const_iterator_end(Inset const & inset)
-{
- return ParConstIterator(doc_iterator_end(const_cast<Inset &>(inset)));
-}
-
-
} // namespace lyx