add GuiView parent to QToc for proper memory management.

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index 8ed2d3ea4a38cb71c0ce9fcd988572844c3e9cbe..181b71c14c0d03782d43b5270fb64473a5d81527 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -23,6 +23,7 @@
 
 #include "support/types.h"
 
+#include <boost/tuple/tuple.hpp>
 #include <boost/utility.hpp>
 #include <boost/signal.hpp>
 
@@ -92,8 +93,6 @@ public:
        /// resize the BufferView.
        void resize();
 
-       /// redisplay the referenced buffer.
-       void reload();
        /// load a buffer into the view.
        bool loadLyXFile(support::FileName const & name, bool tolastfiles = true);
 
@@ -114,22 +113,18 @@ public:
        ScrollbarParameters const & scrollbarParameters() const;
 
        /// Save the current position as bookmark.
-       /// if persistent=false, save to temp_bookmark
-       void saveBookmark(bool persistent);
-       /// goto a specified position.
-       void moveToPosition(
+       /// if idx == 0, save to temp_bookmark
+       void saveBookmark(unsigned int idx);
+       /// goto a specified position, try par_id first, and then par_pit
+       /// return the par_pit and par_id of the new paragraph
+       boost::tuple<pit_type, int> moveToPosition(
+               pit_type par_pit, ///< Paragraph pit, used when par_id is zero or invalid.
                int par_id, ///< Paragraph ID, \sa Paragraph
                pos_type par_pos ///< Position in the \c Paragraph
                );
        /// return the current change at the cursor.
        Change const getCurrentChange() const;
 
-       /// return the lyxtext we are using.
-       LyXText * getLyXText();
-
-       /// return the lyxtext we are using.
-       LyXText const * getLyXText() const;
-
        /// move cursor to the named label.
        void gotoLabel(docstring const & label);
 
@@ -156,7 +151,8 @@ public:
        /// return true for events that will handle.
        FuncStatus getStatus(FuncRequest const & cmd);
        /// execute the given function.
-       bool dispatch(FuncRequest const & argument);
+       /// \return the Update::flags for further metrics update.
+       Update::flags dispatch(FuncRequest const & argument);
 
        /// request an X11 selection.
        /// \return the selected string.
@@ -184,6 +180,9 @@ public:
        /// sets cursor.
        /// This will also open all relevant collapsable insets.
        void setCursor(DocIterator const &);
+       /// Check deleteEmptyParagraphMechanism and update metrics if needed.
+       /// \retval true if an update was needed.
+       bool checkDepm(LCursor & cur, LCursor & old);
        /// sets cursor.
        /// This is used when handling LFUN_MOUSE_PRESS.
        bool mouseSetCursor(LCursor & cur);
@@ -250,6 +249,15 @@ public:
 private:
        ///
        bool multiParSel();
+
+       /// Search recursively for the the innermost inset that covers (x, y) position.
+       /// \retval 0 if no inset is found.
+       InsetBase const * getCoveringInset(
+               LyXText const & text, //< The LyXText where we start searching.
+               int x, //< x-coordinate on screen
+               int y  //< y-coordinate on screen
+               );
+
        ///
        int width_;
        ///