Fix bug #12772

[lyx.git] / src / ParagraphMetrics.h

diff --git a/src/ParagraphMetrics.h b/src/ParagraphMetrics.h
index 53f5f4379a4c37b2121183e6c8fa26ee5c187bfe..0d186f158bc217917d0d563d47a7592871892061 100644 (file)
--- a/src/ParagraphMetrics.h
+++ b/src/ParagraphMetrics.h
@@ -5,10 +5,10 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author John Levon
- * \author André Pönitz
- * \author Jürgen Vigna
+ * \author André Pönitz
+ * \author Jürgen Vigna
  * \author Abdelrazak Younes
  *
  * Full author contact details are available in file CREDITS.
@@ -20,31 +20,16 @@
 #include "Dimension.h"
 #include "Row.h"
 
-#include <map>
-#include <vector>
-
 namespace lyx {
 
-/**
- * Each paragraph is broken up into a number of rows on the screen.
- * This is a list of such on-screen rows, ordered from the top row
- * downwards.
- */
-typedef std::vector<Row> RowList;
-
-class Buffer;
-class BufferParams;
-class Font;
-class Inset;
+class BufferView;
 class Paragraph;
-class MetricsInfo;
-class PainterInfo;
 
 /// Helper class for paragraph metrics.
 class ParagraphMetrics {
 public:
        /// Default constructor (only here for STL containers).
-       ParagraphMetrics() : par_(0) {}
+       ParagraphMetrics() {}
        /// The only useful constructor.
        explicit ParagraphMetrics(Paragraph const & par);
 
@@ -53,14 +38,12 @@ public:
 
        void reset(Paragraph const & par);
 
-       ///
-       Row & getRow(pos_type pos, bool boundary);
        ///
        Row const & getRow(pos_type pos, bool boundary) const;
        ///
        size_t pos2row(pos_type pos) const;
 
-       /// BufferView::redoParagraph updates this
+       /// TextMetrics::redoParagraph updates this
        Dimension const & dim() const { return dim_; }
        Dimension & dim() { return dim_; }
        /// total height of paragraph
@@ -76,9 +59,9 @@ 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;
+       Paragraph const & par() const { return *par_; }
 
        /// dump some information to lyxerr
        void dump() const;
@@ -86,31 +69,23 @@ public:
        ///
        bool hfillExpansion(Row const & row, pos_type pos) const;
 
-       /// 
-       size_t computeRowSignature(Row const &, BufferParams const & bparams) const;
-
        ///
        int position() const { return position_; }
        void setPosition(int position);
-
-       ///
-       Dimension const & insetDimension(Inset const * inset) const;
        ///
-       void setInsetDimension(Inset const *, Dimension const & dim);
+       int id() const { return id_; }
 
 private:
        ///
-       int position_;
+       int position_ = 0;
+       ///
+       int id_ = -1;
        ///
        mutable RowList rows_;
        /// cached dimensions of paragraph
        Dimension dim_;
        ///
-       Paragraph const * par_;
-       
-       typedef std::map<Inset const *, Dimension> InsetDims;
-       ///
-       InsetDims inset_dims_;
+       Paragraph const * par_ = nullptr;
 };
 
 } // namespace lyx