Replace LString.h with support/std_string.h,

[features.git] / src / frontends / xforms / XPainter.h

diff --git a/src/frontends/xforms/XPainter.h b/src/frontends/xforms/XPainter.h
index 221d103459f921448e4c53e501e6a7edeaba03c2..c98bb757722d0c83330a2814525ec8d29c9bc9f3 100644 (file)
--- a/src/frontends/xforms/XPainter.h
+++ b/src/frontends/xforms/XPainter.h
@@ -5,22 +5,16 @@
  * Licence details can be found in the file COPYING.
  *
  * \author unknown
- * \author John Levon 
+ * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef XPAINTER_H
 #define XPAINTER_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include <config.h>
- 
 #include "frontends/Painter.h"
-#include "LString.h"
+#include "support/std_string.h"
 
 #include <X11/Xlib.h>
 
@@ -34,7 +28,7 @@ class XWorkArea;
 class XPainter : public Painter {
 public:
        XPainter(XWorkArea &);
-       
+
        /// return the width of the work area in pixels
        virtual int paperWidth() const;
        /// return the height of the work area in pixels
@@ -42,7 +36,7 @@ public:
 
        /// draw a line from point to point
        virtual Painter & line(
-               int x1, int y1, 
+               int x1, int y1,
                int x2, int y2,
                LColor::color = LColor::foreground,
                line_style = line_solid,
@@ -55,8 +49,8 @@ public:
         * @param np size of the points array
         */
        virtual Painter & lines(
-               int const * xp, 
-               int const * yp, 
+               int const * xp,
+               int const * yp,
                int np,
                LColor::color = LColor::foreground,
                line_style = line_solid,
@@ -69,37 +63,37 @@ public:
                LColor::color = LColor::foreground,
                line_style = line_solid,
                line_width = line_thin);
-       
+
        /// draw a filled rectangle
        virtual Painter & fillRectangle(
                int x, int y,
                int w, int h,
                LColor::color);
-       
+
        /// draw a filled (irregular) polygon
        virtual Painter & fillPolygon(
-               int const * xp, 
-               int const * yp, 
+               int const * xp,
+               int const * yp,
                int np,
-               LColor::color = LColor::foreground); 
- 
+               LColor::color = LColor::foreground);
+
        /// draw an arc
        virtual Painter & arc(
                int x, int y,
                unsigned int w, unsigned int h,
                int a1, int a2,
                LColor::color = LColor::foreground);
- 
+
        /// draw a pixel
        virtual Painter & point(
                int x, int y,
                LColor::color = LColor::foreground);
-       
+
        /// draw an image from the image cache
        virtual Painter & image(int x, int y,
                int w, int h,
-               grfx::Image const & image);
-       
+               lyx::graphics::Image const & image);
+
        /// draw a string at position x, y (y is the baseline)
        virtual Painter & text(int x, int y,
                string const & str, LyXFont const & f);
@@ -116,10 +110,10 @@ public:
                char c, LyXFont const & f);
 
        /// draw a wide string at position x, y
-       Painter & text(int x, int y, 
+       Painter & text(int x, int y,
                XChar2b const * str, size_t l,
                LyXFont const & f);
- 
+
 private:
        /// our owner who we paint upon
        XWorkArea & owner_;