1 files changed, 10 insertions, 11 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
index 248a15b342..c4aeb702af 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h
@@ -51,7 +51,8 @@ QT_BEGIN_HEADER
 QT_MODULE(Gui)
 
 // Inherited by both window surface and pixmap
-    class QDirectFBPaintDevice : public QCustomRasterPaintDevice
+class QDirectFBPaintEngine;
+class QDirectFBPaintDevice : public QCustomRasterPaintDevice
 {
 public:
     ~QDirectFBPaintDevice();
@@ -62,19 +63,16 @@ public:
     void unlockDirectFB();
 
     // Reimplemented from QCustomRasterPaintDevice:
-    void* memory() const;
+    void *memory() const;
     QImage::Format format() const;
     int bytesPerLine() const;
     QSize size() const;
     int metric(QPaintDevice::PaintDeviceMetric metric) const;
     DFBSurfaceLockFlags lockFlags() const { return lock; }
-protected:
-    // Shouldn't create QDirectFBPaintDevice by itself but only sub-class it:
-    QDirectFBPaintDevice(QDirectFBScreen *scr = QDirectFBScreen::instance())
-        : QCustomRasterPaintDevice(0), dfbSurface(0), lockedImage(0), screen(scr),
-        lock(DFBSurfaceLockFlags(0)), mem(0)
-    {}
+    QPaintEngine *paintEngine() const;
 
+protected:
+    QDirectFBPaintDevice(QDirectFBScreen *scr);
     inline int dotsPerMeterX() const
     {
         return (screen->deviceWidth() * 1000) / screen->physicalWidth();
@@ -83,16 +81,17 @@ protected:
     {
         return (screen->deviceHeight() * 1000) / screen->physicalHeight();
     }
-
+protected:
     IDirectFBSurface *dfbSurface;
     QImage *lockedImage;
     QDirectFBScreen *screen;
     int bpl;
     DFBSurfaceLockFlags lock;
     uchar *mem;
+    QDirectFBPaintEngine *engine;
 private:
-    Q_DISABLE_COPY(QDirectFBPaintDevice)
-        };
+    Q_DISABLE_COPY(QDirectFBPaintDevice);
+};
 
 QT_END_HEADER