revert recent change to development/FORMAT (don't change history)

[lyx.git] / src / BufferView_pimpl.h

diff --git a/src/BufferView_pimpl.h b/src/BufferView_pimpl.h
index 6359c26ed3e932f1d5a5c0174d33e91fc499fc41..14c4d52ba5740b6f6ccddcfd99264f071f1b951b 100644 (file)
--- a/src/BufferView_pimpl.h
+++ b/src/BufferView_pimpl.h
@@ -20,39 +20,34 @@
 
 #include "BufferView.h"
 #include "cursor.h"
-#include "errorlist.h"
+#include "metricsinfo.h"
 
 #include "frontends/LyXKeySym.h"
-#include "frontends/Timeout.h"
 
 #include "support/types.h"
 
-#include <boost/signals/trackable.hpp>
-
 class Change;
 class LyXView;
 
 class FuncRequest;
 class FuncStatus;
-class ViewMetricsInfo;
 
 namespace lyx {
 namespace frontend {
 class Gui;
-class Painter;
 }
 }
 
 
 ///
-class BufferView::Pimpl : public boost::signals::trackable {
+class BufferView::Pimpl {
 public:
        ///
        Pimpl(BufferView & bv, LyXView * owner);
        ///
-       lyx::frontend::Painter & painter() const;
-       ///
        void setBuffer(Buffer * buf);
+       /// return the first layout of the Buffer.
+       std::string firstLayout();
        ///
        void resizeCurrentBuffer();
        //
@@ -60,10 +55,8 @@ public:
        //
        bool multiParSel();
        ///
-       void update(Update::flags flags = Update::Force);
-       ///
-       void newFile(std::string const &, std::string const &, bool);
-       ///
+       bool update(Update::flags flags = Update::Force);
+       /// load a buffer into the view
        bool loadLyXFile(std::string const &, bool);
        ///
        void workAreaResize(int width, int height);
@@ -73,17 +66,15 @@ public:
        ScrollbarParameters const & scrollbarParameters() const;
        ///
        void scrollDocView(int value);
+       ///
+       void setCursorFromScrollbar();
        /// Wheel mouse scroll, move by multiples of text->defaultRowHeight().
        void scroll(int lines);
        ///
-       void workAreaKeyPress(LyXKeySymPtr key, key_modifier::state state);
-       ///
        void selectionRequested();
        ///
        void selectionLost();
        ///
-       void cursorToggle();
-       ///
        bool available() const;
        /// get the change at the cursor position
        Change const getCurrentChange();
@@ -106,9 +97,6 @@ public:
        /// a function should be executed
        bool dispatch(FuncRequest const & ev);
 
-       /// the frontend
-       lyx::frontend::Gui & gui() const;
-
        /// Width and height of the BufferView in Pixels
        /**
        This is set externally by the workAreaResize method.
@@ -120,6 +108,11 @@ public:
        */
        int height() const;
 
+       ///
+       ViewMetricsInfo const & viewMetricsInfo();
+       ///
+       void updateMetrics(bool singlepar = false);
+
 private:
        ///
        int width_;
@@ -128,33 +121,11 @@ private:
        ///
        ScrollbarParameters scrollbarParameters_;
 
-       /// An error list (replaces the error insets)
-       ErrorList errorlist_;
-       /// add an error to the list
-       void addError(ErrorItem const &);
-       /// buffer errors signal connection
-       boost::signals::connection errorConnection_;
-       /// buffer messages signal connection
-       boost::signals::connection messageConnection_;
-       /// buffer busy status signal connection
-       boost::signals::connection busyConnection_;
-       /// buffer title changed signal connection
-       boost::signals::connection titleConnection_;
-       /// buffer reset timers signal connection
-       boost::signals::connection timerConnection_;
-       /// buffer readonly status changed signal connection
-       boost::signals::connection readonlyConnection_;
-       /// buffer closing signal connection
-       boost::signals::connection closingConnection_;
-       /// connect to signals in the given buffer
-       void connectBuffer(Buffer & buf);
-       /// disconnect from signals in the given buffer
-       void disconnectBuffer();
        /// track changes for the document
        void trackChanges();
-       /// notify readonly status
-       void showReadonly(bool);
 
+       ///
+       ViewMetricsInfo metrics_info_;
 
        ///
        friend class BufferView;
@@ -169,10 +140,6 @@ private:
        /// Estimated average par height for scrollbar
        int wh_;
        ///
-       Timeout cursor_timeout;
-       ///
-       bool using_xterm_cursor;
-       ///
        class Position {
        public:
                /// Filename
@@ -206,7 +173,6 @@ private:
        lyx::pit_type anchor_ref_;
        ///
        int offset_ref_;
-       ///
-       ViewMetricsInfo metrics(bool singlepar = false);
+
 };
 #endif // BUFFERVIEW_PIMPL_H