* Layout.cpp (read): fix ObsoletedBy and DependsOn for layout names

[lyx.git] / src / ParagraphMetrics.h

diff --git a/src/ParagraphMetrics.h b/src/ParagraphMetrics.h
index 0bff836cc3058f9925c2404e6de2981e8b458e44..6d9a3fa828ca74b9e3195dd098223710e78cc3f4 100644 (file)
--- a/src/ParagraphMetrics.h
+++ b/src/ParagraphMetrics.h
@@ -17,10 +17,17 @@
 #ifndef PARAGRAPH_METRICS_H
 #define PARAGRAPH_METRICS_H
 
-#include "paragraph.h"
+#include "Paragraph.h"
 
 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 MetricsInfo;
 class PainterInfo;
 
@@ -56,12 +63,12 @@ public:
        unsigned int ascent() const { return dim_.ascent(); }
        /// descend of paragraph below baseline
        unsigned int descent() const { return dim_.descent(); }
-       /// LyXText updates the rows using this access point
+       /// Text updates the rows using this access point
        RowList & rows() { return rows_; }
        /// The painter and others use this
        RowList const & rows() const { return rows_; }
        /// The painter and others use this
-       std::vector<bool> const & rowChangeStatus() const 
+       std::vector<bool> const & rowChangeStatus() const
        { return row_change_status_; }
        ///
        void updateRowChangeStatus();
@@ -73,7 +80,9 @@ public:
 
 private:
        ///
-       size_type ParagraphMetrics::calculateRowSignature(Row const &);
+       typedef std::vector<size_type> RowSignature;
+       ///
+       size_type calculateRowSignature(Row const &);
        ///
        mutable RowList rows_;
        ///