X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParIterator.cpp;h=78006b000fae87bc22957eb36ac0d22696b609ef;hb=e995e8556bd670c7183bab7e105073a5f4ccfbc0;hp=867e86ca544d4c78a7e0d93e276ceac69e8dbb75;hpb=1050cc44714f8b78e233d6a559ead3d7a8b6aa56;p=lyx.git diff --git a/src/ParIterator.cpp b/src/ParIterator.cpp index 867e86ca54..78006b000f 100644 --- a/src/ParIterator.cpp +++ b/src/ParIterator.cpp @@ -104,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 /// @@ -140,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(); @@ -164,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); } @@ -175,6 +161,7 @@ bool operator!=(ParConstIterator const & iter1, ParConstIterator const & iter2) { return !(iter1 == iter2); } +#endif // FIXME: const correctness!