fix a visual cursor edge-case:

[lyx.git] / src / ParagraphMetrics.h

diff --git a/src/ParagraphMetrics.h b/src/ParagraphMetrics.h
index 63c9edb76eee13678a0559ce0fb81d413defd26b..e914522efa11ab2b3294863455912c41a1a8a672 100644 (file)
--- a/src/ParagraphMetrics.h
+++ b/src/ParagraphMetrics.h
@@ -18,10 +18,10 @@
 #define PARAGRAPH_METRICS_H
 
 #include "Dimension.h"
-#include "Paragraph.h"
 #include "Row.h"
 
 #include <map>
+#include <vector>
 
 namespace lyx {
 
@@ -32,16 +32,22 @@ namespace lyx {
  */
 typedef std::vector<Row> RowList;
 
+class Buffer;
+class BufferView;
+class BufferParams;
+class Font;
+class Inset;
+class Paragraph;
 class MetricsInfo;
 class PainterInfo;
 
-/// Helper class for Paragraph Metrics.
-class ParagraphMetrics  {
+/// Helper class for paragraph metrics.
+class ParagraphMetrics {
 public:
        /// Default constructor (only here for STL containers).
-       ParagraphMetrics(): par_(0) {};
+       ParagraphMetrics() : par_(0) {}
        /// The only useful constructor.
-       ParagraphMetrics(Paragraph const & par);
+       explicit ParagraphMetrics(Paragraph const & par);
 
        /// Copy operator.
        ParagraphMetrics & operator=(ParagraphMetrics const &);
@@ -71,7 +77,7 @@ public:
        /// The painter and others use this
        RowList const & rows() const { return rows_; }
        ///
-       int rightMargin(Buffer const & buffer) const;
+       int rightMargin(BufferView const & bv) const;
        ///
        int singleWidth(pos_type pos, Font const & Font) const;
 
@@ -82,7 +88,7 @@ public:
        bool hfillExpansion(Row const & row, pos_type pos) const;
 
        /// 
-       void computeRowSignature(Row &, BufferParams const & bparams);
+       size_t computeRowSignature(Row const &, BufferParams const & bparams) const;
 
        ///
        int position() const { return position_; }