Prepare for InsetTableCell.

[lyx.git] / src / ParIterator.cpp

diff --git a/src/ParIterator.cpp b/src/ParIterator.cpp
index 1fbca725b3589fed7081e0a10e5302eee9203a8c..78006b000fae87bc22957eb36ac0d22696b609ef 100644 (file)
--- a/src/ParIterator.cpp
+++ b/src/ParIterator.cpp
@@ -13,9 +13,9 @@
 #include "ParIterator.h"
 
 #include "Paragraph.h"
-#include "LyXText.h"
+#include "Text.h"
 
-#include "insets/InsetBase.h"
+#include "insets/Inset.h"
 
 
 namespace lyx {
@@ -29,13 +29,13 @@ ParIterator::ParIterator(DocIterator const & cur)
 {}
 
 
-ParIterator par_iterator_begin(InsetBase & inset)
+ParIterator par_iterator_begin(Inset & inset)
 {
        return ParIterator(doc_iterator_begin(inset));
 }
 
 
-ParIterator par_iterator_end(InsetBase & inset)
+ParIterator par_iterator_end(Inset & inset)
 {
        return ParIterator(doc_iterator_end(inset));
 }
@@ -67,9 +67,7 @@ ParIterator ParIterator::operator++(int)
 // should not be compiled/used. (Lgb)
 ParIterator & ParIterator::operator--()
 {
-#ifdef WITH_WARNINGS
-#warning look here
-#endif
+       // FIXME: look here
 //     DocIterator::backwardPar();
        return *this;
 }
@@ -106,27 +104,6 @@ ParagraphList & ParIterator::plist() const
 }
 
 
-bool operator==(ParIterator const & iter1, ParIterator const & iter2)
-{
-       return DocIterator(iter1) == DocIterator(iter2);
-}
-
-
-bool operator!=(ParIterator const & iter1, ParIterator const & iter2)
-{
-       return !(iter1 == iter2);
-}
-
-
-DocIterator makeDocIterator(ParIterator const & par, pos_type pos)
-{
-       DocIterator dit(par);
-       dit.pos() = pos;
-       return dit;
-}
-
-
-
 ///
 /// ParConstIterator
 ///
@@ -142,6 +119,12 @@ ParConstIterator::ParConstIterator(ParConstIterator const & pi)
 {}
 
 
+void ParConstIterator::push_back(Inset const & inset)
+{
+       DocIterator::push_back(CursorSlice(const_cast<Inset &>(inset)));
+}
+
+
 ParConstIterator & ParConstIterator::operator++()
 {
        DocIterator::forwardPar();
@@ -166,9 +149,10 @@ ParagraphList const & ParConstIterator::plist() const
        return text()->paragraphs();
 }
 
-
+#if 0
 bool operator==(ParConstIterator const & iter1, ParConstIterator const & iter2)
 {
+       // FIXME: this makes two full copies!
        return DocIterator(iter1) == DocIterator(iter2);
 }
 
@@ -177,21 +161,20 @@ bool operator!=(ParConstIterator const & iter1, ParConstIterator const & iter2)
 {
        return !(iter1 == iter2);
 }
+#endif
 
 
-#ifdef WITH_WARNINGS
-#warning const correctness!
-#endif
+// FIXME: const correctness!
 
-ParConstIterator par_const_iterator_begin(InsetBase const & inset)
+ParConstIterator par_const_iterator_begin(Inset const & inset)
 {
-       return ParConstIterator(doc_iterator_begin(const_cast<InsetBase &>(inset)));
+       return ParConstIterator(doc_iterator_begin(const_cast<Inset &>(inset)));
 }
 
 
-ParConstIterator par_const_iterator_end(InsetBase const & inset)
+ParConstIterator par_const_iterator_end(Inset const & inset)
 {
-       return ParConstIterator(doc_iterator_end(const_cast<InsetBase &>(inset)));
+       return ParConstIterator(doc_iterator_end(const_cast<Inset &>(inset)));
 }