add GuiView parent to QToc for proper memory management.

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 9a03033cf96d49ff0d23729887ad2876e2942a6f..0adb4b29510ad62ea81ae50935e5b920357b79a8 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -139,10 +139,9 @@ public:
        /// This method uses the BufferView CoordCache to locate the
        /// paragraph. The y-coodinate is allowed to be off-screen and
        /// the CoordCache will be automatically updated if needed. This is
-       /// the reason why we need a non const BufferView and why this
-       /// method is non-const.
+       /// the reason why we need a non const BufferView.
        /// FIXME: move to TextMetrics.
-       pit_type getPitNearY(BufferView & bv, int y);
+       pit_type getPitNearY(BufferView & bv, int y) const;
 
        /** Find the word under \c from in the relative location
         *  defined by \c word_location.
@@ -153,10 +152,17 @@ public:
        /// just selects the word the cursor is in
        void selectWord(LCursor & cur, word_location loc);
 
-       /// accept selected change
-       void acceptChange(LCursor & cur);
-       /// reject selected change
-       void rejectChange(LCursor & cur);
+       /// what type of change operation to make 
+       enum ChangeOp {
+               ACCEPT,
+               REJECT
+       };
+       /// accept or reject the selected change
+       void acceptOrRejectChanges(LCursor & cur, ChangeOp op);
+       /// accept the changes within the complete LyXText
+       void acceptChanges(BufferParams const & bparams);
+       /// reject the changes within the complete LyXText
+       void rejectChanges(BufferParams const & bparams);
 
        /// returns true if par was empty and was removed
        bool setCursor(LCursor & cur, pit_type par, pos_type pos,
@@ -185,6 +191,8 @@ public:
        \retval inset is non-null if the cursor is positionned inside
        */
        /// FIXME: move to TextMetrics.
+       /// FIXME: cleanup to use BufferView::getCoveringInset() and
+       /// setCursorFromCoordinates() instead of checkInsetHit().
        InsetBase * editXY(LCursor & cur, int x, int y);
        
        /// Move cursor one line up.
@@ -277,6 +285,9 @@ public:
        void insertStringAsParagraphs(LCursor & cur, docstring const & str);
 
        /// Returns an inset if inset was hit, or 0 if not.
+       /// \warning This method is not recursive! It will return the
+       /// outermost inset within this LyXText.
+       /// \sa BufferView::getCoveringInset() to get the innermost inset.
        InsetBase * checkInsetHit(BufferView &, int x, int y);
 
        ///
@@ -338,12 +349,17 @@ public:
        int cursorY(BufferView const & bv, CursorSlice const & cursor,
                bool boundary) const;
 
-       /// delete double space or empty paragraphs around old cursor
+       /// delete double spaces, leading spaces, and empty paragraphs around old cursor.
+       /// \retval true if a change has happened and we need a redraw.
        /// FIXME: replace LCursor with DocIterator. This is not possible right
        /// now because recordUndo() is called which needs a LCursor.
-       bool deleteEmptyParagraphMechanism(LCursor & cur,
+       static bool deleteEmptyParagraphMechanism(LCursor & cur,
                LCursor & old, bool & need_anchor_change);
 
+       /// delete double spaces, leading spaces, and empty paragraphs
+       /// from \first to \last paragraph
+       void deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool trackChanges);
+
 public:
        /// the current font settings
        LyXFont current_font;
@@ -370,7 +386,7 @@ private:
 
        // fix the cursor `cur' after a characters has been deleted at `where'
        // position. Called by deleteEmptyParagraphMechanism
-       void fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where);
+       static void fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where);
 
        // At cursor position 0, try to merge the paragraph with the one before it.
        // Ignore change tracking, i.e., physically remove the end-of-par character