Really use qstr to convert a string in a QString

[lyx.git] / src / frontends / Painter.h

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index 2f2f5bf81197f56cdaf60285778be96ae655258c..e7f01af9d606442fda5a9a22a1ca07a899bd382c 100644 (file)
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -13,8 +13,6 @@
 #ifndef PAINTER_H
 #define PAINTER_H
 
-#include "Color.h"
-
 #include "support/strfwd.h"
 
 namespace lyx {
@@ -55,12 +53,9 @@ namespace frontend {
 class Painter {
 public:
        Painter() : drawing_enabled_(true) {}
-       /// possible line widths
-       enum line_width {
-               line_thin, //< thin line
-               line_medium, //< medium line
-               line_thick //< thick line
-       };
+
+       float line_width;
+       static const float thin_line;
 
        /// possible line styles
        enum line_style {
@@ -80,7 +75,7 @@ public:
 
        /// draw a line from point to point
        virtual void line(int x1, int y1, int x2, int y2, Color,
-               line_style = line_solid, line_width = line_thin) = 0;
+               line_style = line_solid, float line_width = thin_line) = 0;
 
        /**
         * lines -  draw a set of lines
@@ -89,11 +84,11 @@ public:
         * @param np size of the points array
         */
        virtual void lines(int const * xp, int const * yp, int np, Color,
-               line_style = line_solid, line_width = line_thin) = 0;
+               line_style = line_solid, float line_width = thin_line) = 0;
 
        /// draw a rectangle
        virtual void rectangle(int x, int y, int w, int h, Color,
-               line_style = line_solid, line_width = line_thin) = 0;
+               line_style = line_solid, float line_width = thin_line) = 0;
 
        /// draw a filled rectangle
        virtual void fillRectangle(int x, int y, int w, int h, Color) = 0;
@@ -130,6 +125,9 @@ public:
        */
        virtual int text(int x, int y, char_type c, FontInfo const & f) = 0;
 
+       /// draw the underbar, strikeout, uuline and uwave font attributes
+       virtual void textDecoration(FontInfo const & f, int x, int y, int width) = 0;
+
        /**
         * Draw a string and enclose it inside a rectangle. If
         * back color is specified, the background is cleared with