Account for old versions of Pygments

[lyx.git] / src / ParagraphMetrics.h

diff --git a/src/ParagraphMetrics.h b/src/ParagraphMetrics.h
index 63c9edb76eee13678a0559ce0fb81d413defd26b..7244e2a2d34b1a48b8e43463a1145f22ed3c0840 100644 (file)
--- 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,10 +18,10 @@
 #define PARAGRAPH_METRICS_H
 
 #include "Dimension.h"
-#include "Paragraph.h"
 #include "Row.h"
 
 #include <map>
+#include <vector>
 
 namespace lyx {
 
@@ -32,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 &);
@@ -71,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;
@@ -81,18 +85,13 @@ public:
        ///
        bool hfillExpansion(Row const & row, pos_type pos) const;
 
-       /// 
-       void computeRowSignature(Row &, BufferParams const & bparams);
+       ///
+       size_t computeRowSignature(Row const &, BufferView const & bv) 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_;
@@ -102,10 +101,6 @@ private:
        Dimension dim_;
        ///
        Paragraph const * par_;
-       
-       typedef std::map<Inset const *, Dimension> InsetDims;
-       ///
-       InsetDims inset_dims_;
 };
 
 } // namespace lyx