make frontend::Application a bit slimmer

[lyx.git] / src / DocIterator.cpp

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 7b7a59d2014d0d4fc86c1e776c5069d86314f355..0d8c1002110d46e1fba0e0eb52cac64f1ab25601 100644 (file)
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -401,19 +401,18 @@ bool DocIterator::hasPart(DocIterator const & it) const
 void DocIterator::updateInsets(Inset * inset)
 {
        // this function re-creates the cache of inset pointers.
-       // code taken in part from StableDocIterator::asDocIterator.
        //lyxerr << "converting:\n" << *this << endl;
-       DocIterator dit = DocIterator(*inset);
+       DocIterator dit = *this;
        size_t const n = slices_.size();
+       slices_.resize(0);
        for (size_t i = 0 ; i < n; ++i) {
                BOOST_ASSERT(inset);
-               dit.push_back(slices_[i]);
-               dit.top().inset_ = inset;
+               push_back(dit[i]);
+               top().inset_ = inset;
                if (i + 1 != n)
-                       inset = dit.nextInset();
+                       inset = nextInset();
        }
        //lyxerr << "converted:\n" << *this << endl;
-       operator=(dit);
 }
 
 
@@ -430,22 +429,22 @@ bool DocIterator::fixIfBroken()
                if (&cs.inset() != inset) {
                        // the whole slice is wrong, chop off this as well
                        --i;
-                       LYXERR(Debug::DEBUG) << "fixIfBroken(): inset changed" << endl;
+                       LYXERR(Debug::DEBUG, "fixIfBroken(): inset changed");
                        break;
                } else if (cs.idx() > cs.lastidx()) {
                        cs.idx() = cs.lastidx();
                        cs.pit() = cs.lastpit();
                        cs.pos() = cs.lastpos();
-                       LYXERR(Debug::DEBUG) << "fixIfBroken(): idx fixed" << endl;
+                       LYXERR(Debug::DEBUG, "fixIfBroken(): idx fixed");
                        break;
                } else if (cs.pit() > cs.lastpit()) {
                        cs.pit() = cs.lastpit();
                        cs.pos() = cs.lastpos();
-                       LYXERR(Debug::DEBUG) << "fixIfBroken(): pit fixed" << endl;
+                       LYXERR(Debug::DEBUG, "fixIfBroken(): pit fixed");
                        break;
                } else if (cs.pos() > cs.lastpos()) {
                        cs.pos() = cs.lastpos();
-                       LYXERR(Debug::DEBUG) << "fixIfBroken(): pos fixed" << endl;
+                       LYXERR(Debug::DEBUG, "fixIfBroken(): pos fixed");
                        break;
                } else if (i != n - 1 && cs.pos() != cs.lastpos()) {
                        // get inset which is supposed to be in the next slice
@@ -463,7 +462,7 @@ bool DocIterator::fixIfBroken()
        // Did we make it through the whole slice stack? Otherwise there
        // was a problem at slice i, and we have to chop off above
        if (i < n) {
-               LYXERR(Debug::DEBUG) << "fixIfBroken(): cursor chopped at " << i << endl;
+               LYXERR(Debug::DEBUG, "fixIfBroken(): cursor chopped at " << i);
                resize(i + 1);
                return true;
        } else
@@ -471,6 +470,53 @@ bool DocIterator::fixIfBroken()
 }
 
 
+DocIterator::idx_type DocIterator::find(MathData const & cell) const
+{
+       for (size_t l = 0; l != slices_.size(); ++l) {
+               if (slices_[l].asInsetMath() && &slices_[l].cell() == &cell)
+                       return l;
+       }
+       return -1;
+}
+
+
+DocIterator::idx_type DocIterator::find(InsetMath const * inset) const 
+{
+       for (size_t l = 0; l != slices_.size(); ++l) {
+               if (slices_[l].asInsetMath() == inset)
+                       return l;
+       }
+       return -1;
+}
+
+
+void DocIterator::cutOff(DocIterator::idx_type above, std::vector<CursorSlice> & cut)
+{
+       cut = std::vector<CursorSlice>(slices_.begin() + above + 1, slices_.end());
+       slices_.resize(above + 1);
+}
+
+
+void DocIterator::cutOff(DocIterator::idx_type above) 
+{
+       slices_.resize(above + 1);
+}
+
+
+void DocIterator::append(std::vector<CursorSlice> const & x) 
+{
+       slices_.insert(slices_.end(), x.begin(), x.end());
+}
+
+
+void DocIterator::append(DocIterator::idx_type idx, pos_type pos) 
+{
+       slices_.push_back(CursorSlice());
+       top().idx() = idx;
+       top().pos() = pos;
+}
+
+
 std::ostream & operator<<(std::ostream & os, DocIterator const & dit)
 {
        for (size_t i = 0, n = dit.depth(); i != n; ++i)