Fix 18 memory leaks

[lyx.git] / src / DocIterator.h

diff --git a/src/DocIterator.h b/src/DocIterator.h
index 74dd47438ff85609ba5b8917bcadcd20c3a44c17..cde876cd86f1382a4a6938bfd7f3a91d876eca31 100644 (file)
--- a/src/DocIterator.h
+++ b/src/DocIterator.h
@@ -64,9 +64,7 @@ public:
        void resize(size_t i) { slices_.resize(i); }
 
        /// is the iterator valid?
-       operator const void*() const { return empty() ? 0 : this; }
-       /// is this iterator invalid?
-       bool operator!() const { return empty(); }
+       explicit operator bool() const { return !empty(); }
 
        /// does this iterator have any content?
        bool empty() const { return slices_.empty(); }
@@ -167,6 +165,10 @@ public:
        Paragraph & innerParagraph() const;
        /// return the inner text slice.
        CursorSlice const & innerTextSlice() const;
+       // convert a DocIterator into an argument to LFUN_PARAGRAPH_GOTO
+       docstring paragraphGotoArgument() const;
+       /// returns a DocIterator for the containing text inset
+       DocIterator getInnerText() const;
        /// the first and last positions of a word at top cursor slice
        /// \warning only works within text!
        FontSpan locateWord(word_location const loc) const;
@@ -182,6 +184,10 @@ public:
        //
        // elementary moving
        //
+       /// move one step backwards
+       bool posBackward();
+       /// move one step forward
+       bool posForward();
        /**
         * move on one logical position, descend into nested insets
         * including collapsed insets