X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParIterator.cpp;h=78006b000fae87bc22957eb36ac0d22696b609ef;hb=1797f5218b8819874f9dbe97b44445b3b5d598a0;hp=80f35de25f89a58a37de5c5a551aff711dbe3802;hpb=e0d54dd3b497b78094ea16ab0f38ccdc8c1642e2;p=lyx.git diff --git a/src/ParIterator.cpp b/src/ParIterator.cpp index 80f35de25f..78006b000f 100644 --- a/src/ParIterator.cpp +++ b/src/ParIterator.cpp @@ -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))); +} + + 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,11 +161,10 @@ 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(Inset const & inset) {