Further cleanup of InsetFlex, InsetCollapsable and InsetLayout:

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 45cad7b0384045f9baa8d306565f0fecb548d72c..80fd234f69bf01225d3dd19ca291bbbd2690454b 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -15,22 +15,15 @@
 #define TEXT_METRICS_H
 
 #include "Font.h"
-// FIXME: We only need Point class definition, not the full
-// CoordCache.
-#include "CoordCache.h"
 #include "ParagraphMetrics.h"
 
 #include "support/types.h"
 
-#include <boost/utility.hpp>
-#include <boost/tuple/tuple.hpp>
-
-#include <map>
-
-
 namespace lyx {
 
 class BufferView;
+class Cursor;
+class CursorSlice;
 class DocIterator;
 class MetricsInfo;
 class Text;
@@ -40,7 +33,7 @@ class TextMetrics
 {
 public:
        /// Default constructor (only here for STL containers).
-       TextMetrics(): text_(0) {}
+       TextMetrics() : text_(0) {}
        /// The only useful constructor.
        TextMetrics(BufferView *, Text *);
        
@@ -58,11 +51,10 @@ public:
 
        ///
        Dimension const & dimension() const { return dim_; }
-
+       ///
        Point const & origin() const { return origin_; }
 
 
-
        /// compute text metrics.
        bool metrics(MetricsInfo & mi, Dimension & dim, int min_width = 0);
 
@@ -165,8 +157,8 @@ private:
                pos_type const end
                ) const;
 
-       /// Calculate and set the height of the row
-       boost::tuple<int, int> rowHeight(
+       /// Calculate and set the height of the row (width member is set to 0)
+       Dimension rowHeight(
                pit_type const pit,
                pos_type const first,
                pos_type const end