Introduce LFUN_PRINT.

[lyx.git] / src / frontends / xforms / XPainter.C

diff --git a/src/frontends/xforms/XPainter.C b/src/frontends/xforms/XPainter.C
index 05fd6cc31c29a0a7580a57bf59fd4a873f4458e4..265ee41d099bb1ae15ee35b1f3d94aa245886b80 100644 (file)
--- a/src/frontends/xforms/XPainter.C
+++ b/src/frontends/xforms/XPainter.C
@@ -6,36 +6,32 @@
  * \author Lars Gullik Bjønnes
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "XPainter.h"
-#include "LString.h"
-#include "debug.h"
-#include "XWorkArea.h"
-#include "xfont_metrics.h"
-#include "ColorHandler.h"
-#include "lyxrc.h"
-#include "encoding.h"
-#include "language.h"
 
+#include "ColorHandler.h"
+#include "xfont_metrics.h"
 #include "xformsImage.h"
+#include "XWorkArea.h"
 
-#include "support/LAssert.h"
-#include "support/lstrings.h"
+#include "font_metrics.h"
 
-#include <boost/scoped_array.hpp>
+#include "encoding.h"
+#include "language.h"
+#include "LColor.h"
+#include "lyxfont.h"
+#include "lyxrc.h"
 
-#include <cmath>
+#include "support/lstrings.h"
 
-using namespace lyx::support;
+using lyx::support::uppercase;
 
-using std::endl;
-using std::max;
+using std::string;
 
-namespace grfx = lyx::graphics;
 
 XPainter::XPainter(XWorkArea & xwa)
        : Painter(), owner_(xwa)
@@ -55,7 +51,7 @@ int XPainter::paperHeight() const
 }
 
 
-Painter & XPainter::point(int x, int y, LColor::color c)
+Painter & XPainter::point(int x, int y, LColor_color c)
 {
        XDrawPoint(fl_get_display(), owner_.getPixmap(),
                lyxColorHandler->getGCForeground(c), x, y);
@@ -65,7 +61,7 @@ Painter & XPainter::point(int x, int y, LColor::color c)
 
 Painter & XPainter::line(int x1, int y1,
        int x2, int y2,
-       LColor::color col,
+       LColor_color col,
        line_style ls,
        line_width lw)
 {
@@ -78,7 +74,7 @@ Painter & XPainter::line(int x1, int y1,
 
 Painter & XPainter::lines(int const * xp, int const * yp,
        int np,
-       LColor::color col,
+       LColor_color col,
        line_style ls,
        line_width lw)
 {
@@ -99,7 +95,7 @@ Painter & XPainter::lines(int const * xp, int const * yp,
 
 Painter & XPainter::rectangle(int x, int y,
        int w, int h,
-       LColor::color col,
+       LColor_color col,
        line_style ls,
        line_width lw)
 {
@@ -112,7 +108,7 @@ Painter & XPainter::rectangle(int x, int y,
 
 Painter & XPainter::fillRectangle(int x, int y,
        int w, int h,
-       LColor::color col)
+       LColor_color col)
 {
        XFillRectangle(fl_get_display(), owner_.getPixmap(),
                lyxColorHandler->getGCForeground(col), x, y, w, h);
@@ -121,7 +117,7 @@ Painter & XPainter::fillRectangle(int x, int y,
 
 
 Painter & XPainter::fillPolygon(int const * xp, int const * yp,
-       int np, LColor::color col)
+       int np, LColor_color col)
 {
        boost::scoped_array<XPoint> points(new XPoint[np]);
 
@@ -140,7 +136,7 @@ Painter & XPainter::fillPolygon(int const * xp, int const * yp,
 
 Painter & XPainter::arc(int x, int y,
        unsigned int w, unsigned int h,
-       int a1, int a2, LColor::color col)
+       int a1, int a2, LColor_color col)
 {
        XDrawArc(fl_get_display(), owner_.getPixmap(),
                lyxColorHandler->getGCForeground(col),
@@ -150,11 +146,11 @@ Painter & XPainter::arc(int x, int y,
 
 
 Painter & XPainter::image(int x, int y,
-       int w, int h,
-       grfx::Image const & i)
+                         int w, int h,
+                         lyx::graphics::Image const & i)
 {
-       grfx::xformsImage const & image =
-               static_cast<grfx::xformsImage const &>(i);
+       lyx::graphics::xformsImage const & image =
+               static_cast<lyx::graphics::xformsImage const &>(i);
 
        XGCValues val;
        val.function = GXcopy;