X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.h;h=c2ad4082945d2785c5de21a6a97d884c77caba18;hb=30506f8e116e5d65860c354df88b404884835ee3;hp=dfef036ae7a01303110d5e433d41db9ff7d97f92;hpb=3fdbf5b9c4122b5c9a122978f6374e0b9bcab010;p=lyx.git diff --git a/src/DocIterator.h b/src/DocIterator.h index dfef036ae7..c2ad408294 100644 --- a/src/DocIterator.h +++ b/src/DocIterator.h @@ -115,11 +115,9 @@ public: /// return the last column of the top grid col_type lastcol() const { return ncols() - 1; } /// the inset just behind the cursor - Inset * nextInset(); + Inset * nextInset() const; /// the inset just in front of the cursor - Inset * prevInset(); - /// the inset just in front of the cursor - Inset const * prevInset() const; + Inset * prevInset() const; /// bool boundary() const { return boundary_; } /// @@ -138,48 +136,33 @@ public: // math-specific part // /// return the mathed cell this cursor is in - MathData const & cell() const; - /// return the mathed cell this cursor is in - MathData & cell(); + MathData & cell() const; /// the mathatom left of the cursor - MathAtom const & prevAtom() const; - /// the mathatom left of the cursor - MathAtom & prevAtom(); - /// the mathatom right of the cursor - MathAtom const & nextAtom() const; + MathAtom & prevAtom() const; /// the mathatom right of the cursor - MathAtom & nextAtom(); + MathAtom & nextAtom() const; - // // text-specific part // - /// the paragraph we're in - Paragraph & paragraph(); /// the paragraph we're in in text mode. /// \warning only works within text! - Paragraph const & paragraph() const; + Paragraph & paragraph() const; /// the paragraph we're in in any case. /// This method will give the containing paragraph if /// in not in text mode (ex: in mathed). - Paragraph const & innerParagraph() const; - /// - Text * text(); + Paragraph & innerParagraph() const; /// - Text const * text() const; + Text * text() const; /// the containing inset or the cell, respectively Inset * realInset() const; /// Inset * innerInsetOfType(int code) const; /// - Text * innerText(); - /// - Text const * innerText() const; + Text * innerText() const; // // elementary moving // - /// move on one logical position, do not descend into nested insets - void forwardPosNoDescend(); /** * move on one logical position, descend into nested insets * skip collapsed insets if \p ignorecollapsed is true @@ -189,8 +172,6 @@ public: void forwardChar(); /// move on one paragraph void forwardPar(); - /// move on one cell - void forwardIdx(); /// move on one inset void forwardInset(); /// move backward one logical position @@ -199,8 +180,6 @@ public: void backwardChar(); /// move backward one paragraph void backwardPar(); - /// move backward one cell - void backwardIdx(); /// move backward one inset /// FIXME: This is not implemented! //void backwardInset();