cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / metricsinfo.h

diff --git a/src/metricsinfo.h b/src/metricsinfo.h
index e7d3eeb36073a33b9c90c6e44703b3b1c4da13c9..669679d39c50fa1b6323ba34f4ff4678cdd1ee85 100644 (file)
--- a/src/metricsinfo.h
+++ b/src/metricsinfo.h
@@ -13,12 +13,15 @@
 #define METRICSINFO_H
 
 #include "lyxfont.h"
-#include "support/types.h"
+#include "support/docstring.h"
 
-#include <string>
+class BufferView;
 
+namespace lyx {
+namespace frontend {
 class Painter;
-class BufferView;
+}
+}
 
 
 /// Standard Sizes (mode styles)
@@ -80,16 +83,16 @@ public:
 class PainterInfo {
 public:
        ///
-       PainterInfo(BufferView * bv, Painter & pain);
+       PainterInfo(BufferView * bv, lyx::frontend::Painter & pain);
        ///
-       void draw(int x, int y, char c);
+        void draw(int x, int y, lyx::char_type c);
        ///
-       void draw(int x, int y, std::string const & str);
+       void draw(int x, int y, lyx::docstring const & str);
 
        ///
        MetricsBase base;
        ///
-       Painter & pain;
+       lyx::frontend::Painter & pain;
        /// Whether the text at this point is right-to-left (for InsetNewline)
        bool ltr_pos;
        /// Whether the parent is deleted (change tracking)
@@ -101,9 +104,13 @@ class TextMetricsInfo {};
 class ViewMetricsInfo
 {
 public:
+       ViewMetricsInfo()
+               : p1(0), p2(0), y1(0), y2(0),
+                 singlepar(false), size(0) {}
        ViewMetricsInfo(lyx::pit_type p1, lyx::pit_type p2, int y1, int y2,
-                       bool singlepar, lyx::pit_type size) : p1(p1), p2(p2),
-                       y1(y1), y2(y2), singlepar(singlepar), size(size) {}
+                       bool singlepar, lyx::pit_type size)
+               : p1(p1), p2(p2), y1(y1), y2(y2),
+                 singlepar(singlepar), size(size) {}
        lyx::pit_type p1;
        lyx::pit_type p2;
        int y1;