X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraphMetrics.h;h=63ed0f3cdf689bc6aecf3459c6430b065c228f2c;hb=38c2cde0d8695ac5287bae218c4a33a2acf18ef8;hp=69ac74df417aa567bef66a8a8e841b059ca1ee87;hpb=6ce171eec85dd1ed275daa1c01294e7d4f964d80;p=lyx.git

diff --git a/src/ParagraphMetrics.h b/src/ParagraphMetrics.h
index 69ac74df41..63ed0f3cdf 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.
@@ -18,9 +18,11 @@
 #define PARAGRAPH_METRICS_H
 
 #include "Dimension.h"
-#include "Paragraph.h"
 #include "Row.h"
 
+#include <map>
+#include <vector>
+
 namespace lyx {
 
 /**
@@ -30,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() : position_(0), par_(0) {}
 	/// The only useful constructor.
-	ParagraphMetrics(Paragraph const & par);
+	explicit ParagraphMetrics(Paragraph const & par);
 
 	/// Copy operator.
 	ParagraphMetrics & operator=(ParagraphMetrics const &);
@@ -53,7 +61,7 @@ public:
 	///
 	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
@@ -69,9 +77,7 @@ public:
 	/// The painter and others use this
 	RowList const & rows() const { return rows_; }
 	///
-	int rightMargin(Buffer const & buffer) const;
-	///
-	int singleWidth(pos_type pos, Font const & Font) const;
+	int rightMargin(BufferView const & bv) const;
 
 	/// dump some information to lyxerr
 	void dump() const;
@@ -79,14 +85,10 @@ public:
 	///
 	bool hfillExpansion(Row const & row, pos_type pos) const;
 
-	/// 
-	void computeRowSignature(Row &, BufferParams const & bparams);
-
 	///
 	int position() const { return position_; }
 	void setPosition(int position);
 
-
 private:
 	///
 	int position_;