Some string(widget->text()) fixes. Weirdness

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

diff --git a/src/frontends/qt2/QLPainter.h b/src/frontends/qt2/QLPainter.h
index 7315af8106b36b38951a5f45dcbf3c8e46e863ad..b69bc8575baf8883115a56469b6f7a23d5dd58a1 100644 (file)
--- a/src/frontends/qt2/QLPainter.h
+++ b/src/frontends/qt2/QLPainter.h
@@ -1,10 +1,12 @@
 // -*- C++ -*-
 /**
  * \file QLPainter.h
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #ifndef QLPAINTER_H
@@ -14,16 +16,16 @@
 #pragma interface
 #endif
 
-#include <config.h>
-#include <boost/smart_ptr.hpp>
- 
 #include "Painter.h"
 #include "LString.h"
 #include "LColor.h"
 
+#include <boost/scoped_ptr.hpp>
+
 class LyXFont;
 class QWorkArea;
 class QPainter;
+class QString;
 
 /**
  * QLPainter - a painter implementation for Xlib
@@ -31,13 +33,13 @@ class QPainter;
 class QLPainter : public Painter {
 public:
        QLPainter(QWorkArea &);
-       
+
        /// begin painting
        virtual void start();
 
        /// end painting
        virtual void end();
- 
+
        /// return the width of the work area in pixels
        virtual int paperWidth() const;
        /// return the height of the work area in pixels
@@ -45,7 +47,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,
@@ -58,8 +60,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,
@@ -72,37 +74,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::GImage const & image);
-       
+               grfx::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);
@@ -117,24 +119,22 @@ public:
        /// draw a char at position x, y (y is the baseline)
        virtual Painter & text(int x, int y,
                char c, LyXFont const & f);
-
 private:
        /// draw small caps text
        void smallCapsText(int x, int y,
-               char const * str, size_t l,
-               LyXFont const & f);
+               QString const & str, LyXFont const & f);
 
        /// set pen parameters
-       QPainter & setPen(LColor::color c, 
+       QPainter & setPen(LColor::color c,
                line_style ls = line_solid,
                line_width lw = line_thin);
-       
+
        /// our owner who we paint upon
        QWorkArea & owner_;
 
        /// our qt painter
        boost::scoped_ptr<QPainter> qp_;
- 
+
        /// recursion check
        int paint_check_;
 };