From 97ecf71016d05246080488260e895e36da57c0fc Mon Sep 17 00:00:00 2001 From: Richard Kimberly Heck Date: Fri, 6 Nov 2020 11:30:02 -0500 Subject: [PATCH] Remove dead comment --- src/Buffer.cpp | 1 - src/ParIterator.cpp | 8 ++++---- src/ParIterator.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Buffer.cpp b/src/Buffer.cpp index a6afadf109..23f6315f5f 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -3726,7 +3726,6 @@ void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope) while (it.pit() <= lastpit) { Paragraph & par = it.paragraph(); - // FIXME Can this be done with the new-style iterators? // iterate over the insets of the current paragraph for (auto const & insit : par.insetList()) { it.pos() = insit.pos; diff --git a/src/ParIterator.cpp b/src/ParIterator.cpp index 8086d2fc36..09cee80acc 100644 --- a/src/ParIterator.cpp +++ b/src/ParIterator.cpp @@ -134,14 +134,14 @@ 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); + DocIterator const * dit1 = &iter1; + DocIterator const * dit2 = &iter2; + return *dit1 == *dit2; } - +#if 0 bool operator!=(ParConstIterator const & iter1, ParConstIterator const & iter2) { return !(iter1 == iter2); diff --git a/src/ParIterator.h b/src/ParIterator.h index f1e2752009..e67732f98b 100644 --- a/src/ParIterator.h +++ b/src/ParIterator.h @@ -115,7 +115,7 @@ public: ParagraphList const & plist() const; }; -//bool operator==(ParConstIterator const & it1, ParConstIterator const & it2); +bool operator==(ParConstIterator const & it1, ParConstIterator const & it2); //bool operator!=(ParConstIterator const & it1, ParConstIterator const & it2); -- 2.39.5