X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.h;h=1d690aab7732071944792d67951a81cece524802;hb=bfe98181169d9e697e515da974d9b6a15a06c940;hp=53f5f4379a4c37b2121183e6c8fa26ee5c187bfe;hpb=926abae7536ad564072163057bf8a95758d0be27;p=lyx.git

diff --git a/src/ParagraphMetrics.h b/src/ParagraphMetrics.h
index 53f5f4379a..1d690aab77 100644
--- 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() : position_(0), par_(0) {}
 	/// 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,18 +69,10 @@ 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);
-
 private:
 	///
 	int position_;
@@ -107,10 +82,6 @@ private:
 	Dimension dim_;
 	///
 	Paragraph const * par_;
-	
-	typedef std::map<Inset const *, Dimension> InsetDims;
-	///
-	InsetDims inset_dims_;
 };
 
 } // namespace lyx