X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.h;h=0d186f158bc217917d0d563d47a7592871892061;hb=5cb80b867f4a59c3253487652ba74a29ad5b3f0f;hp=7244e2a2d34b1a48b8e43463a1145f22ed3c0840;hpb=508518ad95a7fd7581bd4affd389dbe7bd6d09f1;p=lyx.git

diff --git a/src/ParagraphMetrics.h b/src/ParagraphMetrics.h
index 7244e2a2d3..0d186f158b 100644
--- a/src/ParagraphMetrics.h
+++ b/src/ParagraphMetrics.h
@@ -20,32 +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 BufferView;
-class BufferParams;
-class Font;
-class Inset;
 class Paragraph;
-class MetricsInfo;
-class PainterInfo;
 
 /// Helper class for paragraph metrics.
 class ParagraphMetrics {
 public:
 	/// Default constructor (only here for STL containers).
-	ParagraphMetrics() : position_(0), par_(0) {}
+	ParagraphMetrics() {}
 	/// The only useful constructor.
 	explicit ParagraphMetrics(Paragraph const & par);
 
@@ -54,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
@@ -78,6 +60,8 @@ public:
 	RowList const & rows() const { return rows_; }
 	///
 	int rightMargin(BufferView const & bv) const;
+	///
+	Paragraph const & par() const { return *par_; }
 
 	/// dump some information to lyxerr
 	void dump() const;
@@ -85,22 +69,23 @@ public:
 	///
 	bool hfillExpansion(Row const & row, pos_type pos) const;
 
-	///
-	size_t computeRowSignature(Row const &, BufferView const & bv) const;
-
 	///
 	int position() const { return position_; }
 	void setPosition(int position);
+	///
+	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_;
+	Paragraph const * par_ = nullptr;
 };
 
 } // namespace lyx