directfb: Backport the work from QtBase to Qt 4.8

This is copying the files (minus the API changes) to Qt 4.8. It fixes
memory leaks, adds DirectFB based image decoding, prepares EGL integration/

Merge-request: 1492
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/src/plugins/platforms/directfb/qdirectfbcursor.h b/src/plugins/platforms/directfb/qdirectfbcursor.h
index b148de5..2f8efba 100644
--- a/src/plugins/platforms/directfb/qdirectfbcursor.h
+++ b/src/plugins/platforms/directfb/qdirectfbcursor.h
@@ -44,20 +44,24 @@
 
 #include <QPlatformCursor>
 #include <directfb.h>
+
+#include "qdirectfbconvenience.h"
+
+QT_BEGIN_NAMESPACE
+
 class QDirectFbScreen;
 class QDirectFbBlitter;
 
 class QDirectFBCursor : public QPlatformCursor
 {
 public:
-    QDirectFBCursor(QPlatformScreen *screem);
-    void changeCursor(QCursor * cursor, QWidget * widget);
+    QDirectFBCursor(QPlatformScreen *screen);
+    void changeCursor(QCursor *cursor, QWidget *window);
 
 private:
-    IDirectFBDisplayLayer * m_layer;
-    IDirectFBSurface * surface;
-    QPlatformCursorImage * image;
-    QDirectFbBlitter *blitter;
+    QScopedPointer<QPlatformCursorImage> m_image;
 };
 
+QT_END_NAMESPACE
+
 #endif // QDIRECTFBCURSOR_H