use std::advance and std::distance instead of home-grown versions

[features.git] / src / PosIterator.C

diff --git a/src/PosIterator.C b/src/PosIterator.C
index 69004c07948d079622c91b360f46f699546fd0b9..28f7111f8e3890946074f34b1ce12db6f1d75e6f 100644 (file)
--- a/src/PosIterator.C
+++ b/src/PosIterator.C
@@ -14,7 +14,7 @@
 
 #include "buffer.h"
 #include "BufferView.h"
-#include "cursor_slice.h"
+#include "cursor.h"
 #include "iterators.h"
 #include "lyxtext.h"
 #include "paragraph.h"
@@ -33,9 +33,9 @@ PosIterator & PosIterator::operator++()
        BOOST_ASSERT(!stack_.empty());
        while (true) {
                PosIteratorItem & p = stack_.back();
-               
+
                if (p.pos < p.pit->size()) {
-                       if (InsetOld * inset = p.pit->getInset(p.pos)) {
+                       if (InsetBase * inset = p.pit->getInset(p.pos)) {
                                if (LyXText * text = inset->getText(p.index)) {
                                        ParagraphList & pl = text->paragraphs();
                                        p.index++;
@@ -49,10 +49,10 @@ PosIterator & PosIterator::operator++()
                        ++p.pit;
                        p.pos = 0;
                }
-               
+
                if (p.pit != p.pl->end() || stack_.size() == 1)
                        return *this;
-               
+
                stack_.pop_back();
        }
        return *this;
@@ -62,13 +62,13 @@ PosIterator & PosIterator::operator++()
 PosIterator & PosIterator::operator--()
 {
        BOOST_ASSERT(!stack_.empty());
-       
+
        // try to go one position backwards: if on the start of the
-       // ParagraphList, pops an item 
+       // ParagraphList, pops an item
        PosIteratorItem & p = stack_.back();
        if (p.pos > 0) {
                --p.pos;
-               InsetOld * inset = p.pit->getInset(p.pos);
+               InsetBase * inset = p.pit->getInset(p.pos);
                if (inset)
                        p.index = inset->numParagraphs();
        } else {
@@ -85,7 +85,7 @@ PosIterator & PosIterator::operator--()
        // try to push an item if there is some left unexplored
        PosIteratorItem & q = stack_.back();
        if (q.pos < q.pit->size()) {
-               InsetOld * inset = q.pit->getInset(q.pos);
+               InsetBase * inset = q.pit->getInset(q.pos);
                if (inset && q.index > 0) {
                        LyXText * text = inset->getText(q.index - 1);
                        BOOST_ASSERT(text);
@@ -105,10 +105,10 @@ bool operator!=(PosIterator const & lhs, PosIterator const & rhs)
 
 bool operator==(PosIterator const & lhs, PosIterator const & rhs)
 {
-       
+
        PosIteratorItem const & li = lhs.stack_.back();
        PosIteratorItem const & ri = rhs.stack_.back();
-       
+
        return (li.pl == ri.pl && li.pit == ri.pit &&
                (li.pit == li.pl->end() || li.pos == ri.pos));
 }
@@ -132,7 +132,7 @@ PosIterator::PosIterator(BufferView & bv)
        LyXText * text = bv.getLyXText();
        lyx::pos_type pos = bv.cursor().pos();
        ParagraphList::iterator pit = text->cursorPar();
-       
+
        ParIterator par = bv.buffer()->par_iterator_begin();
        ParIterator end = bv.buffer()->par_iterator_end();
        for ( ; par != end; ++par) {
@@ -144,29 +144,10 @@ PosIterator::PosIterator(BufferView & bv)
 }
 
 
-InsetOld * PosIterator::inset() const
+InsetBase * PosIterator::inset() const
 {
        if (stack_.size() == 1)
                return 0;
        PosIteratorItem const & pi = stack_[stack_.size() - 2];
        return pi.pit->getInset(pi.pos);
 }
-
-
-int distance(PosIterator const & cur, PosIterator const & end)
-{
-       PosIterator p = cur;
-       int count = 0;
-       for (; p != end; ++p, ++count)
-               ;
-       return count;
-}
-
-
-void advance(PosIterator & cur, int howmuch)
-{
-       for (int i = 0; i < howmuch; ++i)
-               ++cur;
-       for (int i = 0; i > howmuch; --i)
-               --cur;
-}