The EnumLColor patch, free of macros.

[features.git] / src / frontends / qt2 / QLPainter.h

diff --git a/src/frontends/qt2/QLPainter.h b/src/frontends/qt2/QLPainter.h
index 45afb461c100601434b0f2b6745184bd5e191409..ff3fc3d4fb0d117850f262a521dcf25f48af6e1d 100644 (file)
--- a/src/frontends/qt2/QLPainter.h
+++ b/src/frontends/qt2/QLPainter.h
@@ -15,7 +15,6 @@
 
 #include "Painter.h"
 #include "support/std_string.h"
-#include "LColor.h"
 
 #include <boost/scoped_ptr.hpp>
 
@@ -46,7 +45,7 @@ public:
        virtual Painter & line(
                int x1, int y1,
                int x2, int y2,
-               LColor::color = LColor::foreground,
+               EnumLColor,
                line_style = line_solid,
                line_width = line_thin);
 
@@ -60,7 +59,7 @@ public:
                int const * xp,
                int const * yp,
                int np,
-               LColor::color = LColor::foreground,
+               EnumLColor,
                line_style = line_solid,
                line_width = line_thin);
 
@@ -68,7 +67,7 @@ public:
        virtual Painter & rectangle(
                int x, int y,
                int w, int h,
-               LColor::color = LColor::foreground,
+               EnumLColor,
                line_style = line_solid,
                line_width = line_thin);
 
@@ -76,26 +75,26 @@ public:
        virtual Painter & fillRectangle(
                int x, int y,
                int w, int h,
-               LColor::color);
+               EnumLColor);
 
        /// draw a filled (irregular) polygon
        virtual Painter & fillPolygon(
                int const * xp,
                int const * yp,
                int np,
-               LColor::color = LColor::foreground);
+               EnumLColor);
 
        /// draw an arc
        virtual Painter & arc(
                int x, int y,
                unsigned int w, unsigned int h,
                int a1, int a2,
-               LColor::color = LColor::foreground);
+               EnumLColor);
 
        /// draw a pixel
        virtual Painter & point(
                int x, int y,
-               LColor::color = LColor::foreground);
+               EnumLColor);
 
        /// draw an image from the image cache
        virtual Painter & image(int x, int y,
@@ -122,7 +121,7 @@ private:
                QString const & str, LyXFont const & f);
 
        /// set pen parameters
-       QPainter & setPen(LColor::color c,
+       QPainter & setPen(EnumLColor c,
                line_style ls = line_solid,
                line_width lw = line_thin);