Remove using directives from headers

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

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index 7906aa986be865e8e60a0051a2df403b4e8b4ecf..b62a4e5c2678a7fc7c4c9d94037cc1b221ce1ccd 100644 (file)
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -56,7 +56,7 @@ class Painter {
 public:
        Painter(double pixel_ratio) : drawing_enabled_(true), pixel_ratio_(pixel_ratio) {}
 
-       static const float thin_line;
+       static const int thin_line;
 
        /// possible line styles
        enum line_style {
@@ -83,7 +83,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, float line_width = thin_line) = 0;
+               line_style = line_solid, int line_width = thin_line) = 0;
 
        /**
         * lines -  draw a set of lines
@@ -93,11 +93,28 @@ public:
         */
        virtual void lines(int const * xp, int const * yp, int np, Color,
                fill_style = fill_none, line_style = line_solid,
-               float line_width = thin_line) = 0;
+               int line_width = thin_line) = 0;
+
+       /**
+        * path -  draw a path with bezier curves
+        * @param xp array of points' x co-ords
+        * @param yp array of points' y co-ords
+        * @param c1x array of first control points' x co-ords
+        * @param c1y array of first control points' y co-ords
+        * @param c2x array of second control points' x co-ords
+        * @param c2y array of second control points' y co-ords
+        * @param np size of the points array
+        */
+       virtual void path(int const * xp, int const * yp,
+               int const * c1x, int const * c1y,
+               int const * c2x, int const * c2y,
+               int np, Color,
+               fill_style = fill_none, line_style = line_solid,
+               int line_width = thin_line) = 0;
 
        /// draw a rectangle
        virtual void rectangle(int x, int y, int w, int h, Color,
-               line_style = line_solid, float line_width = thin_line) = 0;
+               line_style = line_solid, int line_width = thin_line) = 0;
 
        /// draw a filled rectangle
        virtual void fillRectangle(int x, int y, int w, int h, Color) = 0;
@@ -116,25 +133,25 @@ public:
        virtual void image(int x, int y, int w, int h,
                graphics::Image const & image) = 0;
 
-       /** draw a string at position x, y (y is the baseline). The
-        * text direction is given by \c rtl.
-        * \return the width of the drawn text.
-        */
-       virtual int text(int x, int y, docstring const & str, FontInfo const & f, bool rtl = false) = 0;
+       /// draw a string at position x, y (y is the baseline).
+       virtual void text(int x, int y, docstring const & str, FontInfo const & f) = 0;
+
+       /// draw a char at position x, y (y is the baseline)
+       virtual void text(int x, int y, char_type c, FontInfo const & f) = 0;
 
        /** draw a string at position x, y (y is the baseline). The
         * text direction is enforced by the \c Font.
-        * \return the width of the drawn text.
         */
-       virtual int text(int x, int y, docstring const & str, Font const & f) = 0;
+       virtual void text(int x, int y, docstring const & str, Font const & f,
+                      double wordspacing, double textwidth) = 0;
 
        /** draw a string at position x, y (y is the baseline), but
         * make sure that the part between \c from and \c to is in
         * \c other color. The text direction is enforced by the \c Font.
-        * \return the width of the drawn text.
         */
-       virtual int text(int x, int y, docstring const & str, Font const & f,
-                        Color other, size_type from, size_type to) = 0;
+       virtual void text(int x, int y, docstring const & str, Font const & f,
+                         Color other, size_type from, size_type to,
+                      double wordspacing, double textwidth) = 0;
 
        void setDrawingEnabled(bool drawing_enabled)
        { drawing_enabled_ = drawing_enabled; }
@@ -144,12 +161,6 @@ public:
 
        double pixelRatio() const { return pixel_ratio_; }
 
-       /// draw a char at position x, y (y is the baseline)
-       /**
-       * \return the width of the drawn text.
-       */
-       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;