cosmetics

[lyx.git] / src / BufferView.h

diff --git a/src/BufferView.h b/src/BufferView.h
index b92e908368a9e542ca16cf5c44d07b13e10a7d35..9dfe5568cfbb08cf2862f8bb49720b477d746295 100644 (file)
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -15,18 +15,11 @@
 #ifndef BUFFER_VIEW_H
 #define BUFFER_VIEW_H
 
-#include "Dimension.h"
 #include "update_flags.h"
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
 #include "support/types.h"
 
-#include <boost/noncopyable.hpp>
-
-#include <utility>
-#include <string>
-
-
 namespace lyx {
 
 namespace support { class FileName; }
@@ -45,6 +38,7 @@ class Intl;
 class Inset;
 class ParIterator;
 class ParagraphMetrics;
+class Point;
 class Text;
 class TextMetrics;
 class ViewMetricsInfo;
@@ -85,7 +79,7 @@ struct ScrollbarParameters
  * \sa Buffer
  * \sa CoordCache
  */
-class BufferView : boost::noncopyable {
+class BufferView {
 public:
        ///
        BufferView(Buffer & buffer);
@@ -190,7 +184,7 @@ public:
        bool checkDepm(Cursor & cur, Cursor & old);
        /// sets cursor.
        /// This is used when handling LFUN_MOUSE_PRESS.
-       bool mouseSetCursor(Cursor & cur);
+       bool mouseSetCursor(Cursor & cur, bool select = false);
 
        /// sets the selection.
        /* When \c backwards == false, set anchor
@@ -207,8 +201,7 @@ public:
        /// \sa ViewMetricsInfo
        ViewMetricsInfo const & viewMetricsInfo();
        /// update the internal \c ViewMetricsInfo.
-       /// \param singlepar indicates wether
-       void updateMetrics(bool singlepar = false);
+       void updateMetrics();
 
        ///
        TextMetrics const & textMetrics(Text const * t) const;
@@ -262,13 +255,15 @@ public:
        void insertPlaintextFile(std::string const & fileName, bool asParagraph);
 
 private:
+       /// noncopyable
+       BufferView(BufferView const &);
+       void operator=(BufferView const &);
+
        // the position relative to (0, baseline) of outermost paragraph
        Point coordOffset(DocIterator const & dit, bool boundary) const;
        /// Update current paragraph metrics.
        /// \return true if no further update is needed.
        bool singleParUpdate();
-       ///
-       bool multiParSel();
 
        /// Search recursively for the the innermost inset that covers (x, y) position.
        /// \retval 0 if no inset is found.
@@ -290,8 +285,8 @@ private:
 
        void updateOffsetRef();
 
-       struct BufferViewPrivate;
-       BufferViewPrivate & d;
+       struct Private;
+       Private * const d;
 };
 
 /// some space for drawing the 'nested' markers (in pixel)