Refactor QDirectFBPaintDevice

Make the engine a member in QDirectFBPaintDevice instead of one in
QDirectFBPixmapData and one in QDirectFBWindowSurface.

Don't use the default screen for the dfbpaintdevices. Pass one
explicitly.

Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
index 8f3ce41617..55671029d4 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
@@ -56,7 +56,7 @@ class QDirectFBPaintEngine;
 class QDirectFBPixmapData : public QPixmapData, public QDirectFBPaintDevice
 {
 public:
-    QDirectFBPixmapData(PixelType pixelType);
+    QDirectFBPixmapData(QDirectFBScreen *screen, PixelType pixelType);
     ~QDirectFBPixmapData();
 
     // Re-implemented from QPixmapData:
@@ -78,7 +78,6 @@ public:
     static bool hasAlphaChannel(const QImage &img);
 private:
     void invalidate();
-    QDirectFBPaintEngine *engine;
     QImage::Format format;
     bool alpha;
 };