* QLPainter:

  - ctor and dtor moved to public:
  - QLPainter(): takes a QPaintdevice instead of a QWidget.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15619 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/QLPainter.C b/src/frontends/qt4/QLPainter.C
index da811712fe696b3af7dec4e63e76aa6660a3e5b0..beba02550cdf6507c869e9bf7bc37a2a9cd0ab45 100644 (file)
--- a/src/frontends/qt4/QLPainter.C
+++ b/src/frontends/qt4/QLPainter.C
@@ -26,19 +26,15 @@
 
 #include "support/unicode.h"
 
-#include <QWidget>
-
 using std::endl;
 using std::string;
 
 namespace lyx {
 namespace frontend {
 
-QLPainter::QLPainter(QWidget * qwa)
-       : qwa_(qwa)
+QLPainter::QLPainter(QPaintDevice * device)
+       : QPainter(device), Painter()
 {
-       //lyxerr << "QLPainter::start()" << endl;
-       QPainter::begin(qwa_);
        setRenderHint(QPainter::TextAntialiasing);
        // new QPainter has default QPen:
        current_color_ = LColor::black;

diff --git a/src/frontends/qt4/QLPainter.h b/src/frontends/qt4/QLPainter.h
index a88daec579b613f5c20775b825b19fc60c858b42..5403dd6a711ff8c22d61b688e28b838e2bb78e44 100644 (file)
--- a/src/frontends/qt4/QLPainter.h
+++ b/src/frontends/qt4/QLPainter.h
@@ -25,13 +25,14 @@ class LyXFont;
 
 namespace frontend {
 
-class GuiWorkArea;
-
 /**
  * QLPainter - a painter implementation for Qt4
  */
 class QLPainter : public QPainter, public Painter {
 public:
+       QLPainter(QPaintDevice *);
+       virtual ~QLPainter();
+
        /// draw a line from point to point
        virtual void line(
                int x1, int y1,
@@ -101,10 +102,6 @@ public:
                 lyx::char_type c, LyXFont const & f);
 
 private:
-       friend class GuiWorkArea;
-       QLPainter(QWidget *);
-       virtual ~QLPainter();
-
        /// draw small caps text
        /**
        \return width of the drawn text.
@@ -117,9 +114,6 @@ private:
                line_style ls = line_solid,
                line_width lw = line_thin);
 
-       /// the working area
-       QWidget * qwa_;
-
        LColor::color current_color_;
        Painter::line_style current_ls_;
        Painter::line_width current_lw_;