Refactored QGraphicsSystemCursor -> QPlatformCursor

14 files changed, 79 insertions, 75 deletions

diff --git a/src/gui/image/qpixmap_blitter.cpp b/src/gui/image/qpixmap_blitter.cpp
index 660f4d2..d91a269 100644
--- a/src/gui/image/qpixmap_blitter.cpp
+++ b/src/gui/image/qpixmap_blitter.cpp
@@ -37,7 +37,11 @@ QBlittable *QBlittablePixmapData::blittable() const
 {
     if (!m_blittable) {
         QBlittablePixmapData *that = const_cast<QBlittablePixmapData *>(this);
+#ifdef Q_WS_QPA //####jl: graphics system nor platformintegration should have createBlittable
+        that->m_blittable = QApplicationPrivate::platformIntegration()->createBlittable(QSize(w,h));
+#else
         that->m_blittable = QApplicationPrivate::graphicsSystem()->createBlittable(QSize(w,h));
+#endif
     }
 
     return m_blittable;
diff --git a/src/gui/kernel/qapplication_qpa.cpp b/src/gui/kernel/qapplication_qpa.cpp
index afa069b..1fc202c 100644
--- a/src/gui/kernel/qapplication_qpa.cpp
+++ b/src/gui/kernel/qapplication_qpa.cpp
@@ -57,7 +57,7 @@
 #include <qdesktopwidget.h>
 
 #include <qinputcontext.h>
-#include <QGraphicsSystemCursor>
+#include <QPlatformCursor>
 #include <qdebug.h>
 #include <QWindowSystemInterface>
 #include <QPlatformIntegration>
@@ -705,8 +705,8 @@ void QApplicationPrivate::processMouseEvent(QWindowSystemInterface::MouseEvent *
 
     QMouseEvent ev(type, localPoint, globalPoint, button, buttons, modifiers);
 
-    QList<QWeakPointer<QGraphicsSystemCursor> > cursors = QGraphicsSystemCursorPrivate::getInstances();
-    foreach (QWeakPointer<QGraphicsSystemCursor> cursor, cursors) {
+    QList<QWeakPointer<QPlatformCursor> > cursors = QPlatformCursorPrivate::getInstances();
+    foreach (QWeakPointer<QPlatformCursor> cursor, cursors) {
         if (cursor)
             cursor.data()->pointerEvent(ev);
     }
diff --git a/src/gui/kernel/qwidget_qpa.cpp b/src/gui/kernel/qwidget_qpa.cpp
index 11fa211..a543c8f 100644
--- a/src/gui/kernel/qwidget_qpa.cpp
+++ b/src/gui/kernel/qwidget_qpa.cpp
@@ -49,7 +49,7 @@
 #include "QtGui/qdesktopwidget.h"
 #include "QtGui/qplatformwindow_qpa.h"
 
-#include <QtGui/QGraphicsSystemCursor>
+#include <QtGui/QPlatformCursor>
 
 QT_BEGIN_NAMESPACE
 static QPlatformScreen *qt_screenForWidget(const QWidget *w);
@@ -800,7 +800,7 @@ void qt_lite_set_cursor(QWidget * w, bool force)
         cursorCursor = w->cursor();
         cursorWidget = w;
     } while (0);
-    foreach (QWeakPointer<QGraphicsSystemCursor> cursor, QGraphicsSystemCursorPrivate::getInstances())
+    foreach (QWeakPointer<QPlatformCursor> cursor, QPlatformCursorPrivate::getInstances())
         if (cursor)
             cursor.data()->changeCursor(&cursorCursor, cursorWidget);
 }
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index 8d9b09e..b235320 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -191,9 +191,9 @@ qpa {
         SOURCES += \
                 painting/qcolormap_qpa.cpp \
                 painting/qpaintdevice_qpa.cpp \
-                painting/qgraphicssystemcursor_qpa.cpp
+                painting/qplatformcursor_qpa.cpp
         HEADERS += \
-                painting/qgraphicssystemcursor_qpa.h
+                painting/qplatformcursor_qpa.h
 }
 
 symbian {
diff --git a/src/gui/painting/qgraphicssystemcursor_qpa.cpp b/src/gui/painting/qplatformcursor_qpa.cpp
index 24376f9..6665396 100644
--- a/src/gui/painting/qgraphicssystemcursor_qpa.cpp
+++ b/src/gui/painting/qplatformcursor_qpa.cpp
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "qgraphicssystemcursor_qpa.h"
+#include "qplatformcursor_qpa.h"
 
 #include <QWidget>
 #include <QPainter>
@@ -49,7 +49,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QList <QWeakPointer<QGraphicsSystemCursor> > QGraphicsSystemCursorPrivate::instances;
+QList <QWeakPointer<QPlatformCursor> > QPlatformCursorPrivate::instances;
 
 /*!
     \class QGraphicsSystemCursor
@@ -95,10 +95,10 @@ QList <QWeakPointer<QGraphicsSystemCursor> > QGraphicsSystemCursorPrivate::insta
 
     \brief Constructs a QGraphicsSystemCursor
 */
-QGraphicsSystemCursor::QGraphicsSystemCursor(QPlatformScreen *scr )
+QPlatformCursor::QPlatformCursor(QPlatformScreen *scr )
         : screen(scr)
 {
-    QGraphicsSystemCursorPrivate::instances.append(this);
+    QPlatformCursorPrivate::instances.append(this);
 }
 
 // End of display and pointer event handling code
@@ -114,7 +114,7 @@ QGraphicsSystemCursor::QGraphicsSystemCursor(QPlatformScreen *scr )
     \sa QGraphicsSystemCursor
 */
 
-static QGraphicsSystemCursorImage *systemCursorTable[Qt::LastCursor+1];
+static QPlatformCursorImage *systemCursorTable[Qt::LastCursor+1];
 static bool systemCursorTableInit = false;
 
 // 16 x 16
@@ -397,7 +397,7 @@ static const uchar closedhandm_bits[] = {
     0xf0,0x7f,0xf8,0x7f,0xfc,0x7f,0xfc,0x3f,0xf8,0x3f,0xf0,0x1f,
     0xe0,0x1f,0xe0,0x1f,0x00,0x00,0x00,0x00};
 
-void QGraphicsSystemCursorImage::createSystemCursor(int id)
+void QPlatformCursorImage::createSystemCursor(int id)
 {
     if (!systemCursorTableInit) {
         for (int i = 0; i <= Qt::LastCursor; i++)
@@ -408,97 +408,97 @@ void QGraphicsSystemCursorImage::createSystemCursor(int id)
         // 16x16 cursors
         case Qt::ArrowCursor:
             systemCursorTable[Qt::ArrowCursor] =
-                new QGraphicsSystemCursorImage(cur_arrow_bits, mcur_arrow_bits, 16, 16, 0, 0);
+                new QPlatformCursorImage(cur_arrow_bits, mcur_arrow_bits, 16, 16, 0, 0);
             break;
 
         case Qt::UpArrowCursor:
             systemCursorTable[Qt::UpArrowCursor] =
-                new QGraphicsSystemCursorImage(cur_up_arrow_bits, mcur_up_arrow_bits, 16, 16, 7, 0);
+                new QPlatformCursorImage(cur_up_arrow_bits, mcur_up_arrow_bits, 16, 16, 7, 0);
             break;
 
         case Qt::CrossCursor:
             systemCursorTable[Qt::CrossCursor] =
-                new QGraphicsSystemCursorImage(cur_cross_bits, mcur_cross_bits, 16, 16, 7, 7);
+                new QPlatformCursorImage(cur_cross_bits, mcur_cross_bits, 16, 16, 7, 7);
             break;
 
         case Qt::IBeamCursor:
             systemCursorTable[Qt::IBeamCursor] =
-                new QGraphicsSystemCursorImage(cur_ibeam_bits, mcur_ibeam_bits, 16, 16, 7, 7);
+                new QPlatformCursorImage(cur_ibeam_bits, mcur_ibeam_bits, 16, 16, 7, 7);
             break;
 
         case Qt::SizeVerCursor:
             systemCursorTable[Qt::SizeVerCursor] =
-                new QGraphicsSystemCursorImage(cur_ver_bits, mcur_ver_bits, 16, 16, 7, 7);
+                new QPlatformCursorImage(cur_ver_bits, mcur_ver_bits, 16, 16, 7, 7);
             break;
 
         case Qt::SizeHorCursor:
             systemCursorTable[Qt::SizeHorCursor] =
-                new QGraphicsSystemCursorImage(cur_hor_bits, mcur_hor_bits, 16, 16, 7, 7);
+                new QPlatformCursorImage(cur_hor_bits, mcur_hor_bits, 16, 16, 7, 7);
             break;
 
         case Qt::SizeBDiagCursor:
             systemCursorTable[Qt::SizeBDiagCursor] =
-                new QGraphicsSystemCursorImage(cur_bdiag_bits, mcur_bdiag_bits, 16, 16, 7, 7);
+                new QPlatformCursorImage(cur_bdiag_bits, mcur_bdiag_bits, 16, 16, 7, 7);
             break;
 
         case Qt::SizeFDiagCursor:
             systemCursorTable[Qt::SizeFDiagCursor] =
-                new QGraphicsSystemCursorImage(cur_fdiag_bits, mcur_fdiag_bits, 16, 16, 7, 7);
+                new QPlatformCursorImage(cur_fdiag_bits, mcur_fdiag_bits, 16, 16, 7, 7);
             break;
 
         case Qt::BlankCursor:
             systemCursorTable[Qt::BlankCursor] =
-                new QGraphicsSystemCursorImage(0, 0, 0, 0, 0, 0);
+                new QPlatformCursorImage(0, 0, 0, 0, 0, 0);
             break;
 
         // 20x20 cursors
         case Qt::ForbiddenCursor:
             systemCursorTable[Qt::ForbiddenCursor] =
-                new QGraphicsSystemCursorImage(forbidden_bits, forbiddenm_bits, 20, 20, 10, 10);
+                new QPlatformCursorImage(forbidden_bits, forbiddenm_bits, 20, 20, 10, 10);
             break;
 
         // 32x32 cursors
         case Qt::WaitCursor:
             systemCursorTable[Qt::WaitCursor] =
-                new QGraphicsSystemCursorImage(wait_data_bits, wait_mask_bits, 32, 32, 15, 15);
+                new QPlatformCursorImage(wait_data_bits, wait_mask_bits, 32, 32, 15, 15);
             break;
 
         case Qt::SplitVCursor:
             systemCursorTable[Qt::SplitVCursor] =
-                new QGraphicsSystemCursorImage(vsplit_bits, vsplitm_bits, 32, 32, 15, 15);
+                new QPlatformCursorImage(vsplit_bits, vsplitm_bits, 32, 32, 15, 15);
             break;
 
         case Qt::SplitHCursor:
             systemCursorTable[Qt::SplitHCursor] =
-                new QGraphicsSystemCursorImage(hsplit_bits, hsplitm_bits, 32, 32, 15, 15);
+                new QPlatformCursorImage(hsplit_bits, hsplitm_bits, 32, 32, 15, 15);
             break;
 
         case Qt::SizeAllCursor:
             systemCursorTable[Qt::SizeAllCursor] =
-                new QGraphicsSystemCursorImage(size_all_data_bits, size_all_mask_bits, 32, 32, 15, 15);
+                new QPlatformCursorImage(size_all_data_bits, size_all_mask_bits, 32, 32, 15, 15);
             break;
 
         case Qt::PointingHandCursor:
             systemCursorTable[Qt::PointingHandCursor] =
-                new QGraphicsSystemCursorImage(phand_bits, phandm_bits, 32, 32, 0, 0);
+                new QPlatformCursorImage(phand_bits, phandm_bits, 32, 32, 0, 0);
             break;
 
         case Qt::WhatsThisCursor:
             systemCursorTable[Qt::WhatsThisCursor] =
-                new QGraphicsSystemCursorImage(whatsthis_bits, whatsthism_bits, 32, 32, 0, 0);
+                new QPlatformCursorImage(whatsthis_bits, whatsthism_bits, 32, 32, 0, 0);
             break;
         case Qt::BusyCursor:
             systemCursorTable[Qt::BusyCursor] =
-                new QGraphicsSystemCursorImage(busy_bits, busym_bits, 32, 32, 0, 0);
+                new QPlatformCursorImage(busy_bits, busym_bits, 32, 32, 0, 0);
             break;
 
         case Qt::OpenHandCursor:
             systemCursorTable[Qt::OpenHandCursor] =
-                new QGraphicsSystemCursorImage(openhand_bits, openhandm_bits, 16, 16, 8, 8);
+                new QPlatformCursorImage(openhand_bits, openhandm_bits, 16, 16, 8, 8);
             break;
         case Qt::ClosedHandCursor:
             systemCursorTable[Qt::ClosedHandCursor] =
-                new QGraphicsSystemCursorImage(closedhand_bits, closedhandm_bits, 16, 16, 8, 8);
+                new QPlatformCursorImage(closedhand_bits, closedhandm_bits, 16, 16, 8, 8);
             break;
         default:
             qWarning("Unknown system cursor %d", id);
@@ -516,9 +516,9 @@ void QGraphicsSystemCursorImage::createSystemCursor(int id)
     Qt::ArrowCursor is used instead.
 */
 
-void QGraphicsSystemCursorImage::set(Qt::CursorShape id)
+void QPlatformCursorImage::set(Qt::CursorShape id)
 {
-    QGraphicsSystemCursorImage *cursor = 0;
+    QPlatformCursorImage *cursor = 0;
     if (id >= 0 && id <= Qt::LastCursor) {
         if (!systemCursorTable[id])
             createSystemCursor(id);
@@ -546,7 +546,7 @@ void QGraphicsSystemCursorImage::set(Qt::CursorShape id)
     \a hy the y coordinate of the cursor's hotspot
 */
 
-void QGraphicsSystemCursorImage::set(const QImage * image, int hx, int hy)
+void QPlatformCursorImage::set(const QImage * image, int hx, int hy)
 {
     hot.setX(hx);
     hot.setY(hy);
@@ -571,7 +571,7 @@ void QGraphicsSystemCursorImage::set(const QImage * image, int hx, int hy)
 
     \a hy The Y hotspot of the cursor graphic
 */
-void QGraphicsSystemCursorImage::set(const uchar *data, const uchar *mask,
+void QPlatformCursorImage::set(const uchar *data, const uchar *mask,
                     int width, int height, int hx, int hy)
 {
     hot.setX(hx);
diff --git a/src/gui/painting/qgraphicssystemcursor_qpa.h b/src/gui/painting/qplatformcursor_qpa.h
index 9c65f7f..bb8bbb7 100644
--- a/src/gui/painting/qgraphicssystemcursor_qpa.h
+++ b/src/gui/painting/qplatformcursor_qpa.h
@@ -52,9 +52,9 @@
 QT_BEGIN_NAMESPACE
 
 // Cursor graphics management
-class Q_GUI_EXPORT QGraphicsSystemCursorImage {
+class Q_GUI_EXPORT QPlatformCursorImage {
 public:
-    QGraphicsSystemCursorImage(const uchar *data, const uchar *mask, int width, int height, int hotX, int hotY)
+    QPlatformCursorImage(const uchar *data, const uchar *mask, int width, int height, int hotX, int hotY)
     { set(data, mask, width, height, hotX, hotY); }
     QImage * image() { return &cursorImage; }
     QPoint hotspot() { return hot; }
@@ -67,17 +67,17 @@ private:
     QPoint hot;
 };
 
-class QGraphicsSystemCursor;
+class QPlatformCursor;
 
-class QGraphicsSystemCursorPrivate {
+class QPlatformCursorPrivate {
 public:
-    static QList<QWeakPointer<QGraphicsSystemCursor> > getInstances() { return instances; }
-    static QList<QWeakPointer<QGraphicsSystemCursor> > instances;
+    static QList<QWeakPointer<QPlatformCursor> > getInstances() { return instances; }
+    static QList<QWeakPointer<QPlatformCursor> > instances;
 };
 
-class Q_GUI_EXPORT QGraphicsSystemCursor : public QObject {
+class Q_GUI_EXPORT QPlatformCursor : public QObject {
 public:
-    QGraphicsSystemCursor(QPlatformScreen *);
+    QPlatformCursor(QPlatformScreen *);
 
     // input methods
     virtual void pointerEvent(const QMouseEvent & event) { Q_UNUSED(event); }
@@ -87,7 +87,7 @@ protected:
     QPlatformScreen* screen;  // Where to request an update
 
 private:
-    Q_DECLARE_PRIVATE(QGraphicsSystemCursor);
+    Q_DECLARE_PRIVATE(QPlatformCursor);
     friend void qt_lite_set_cursor(QWidget * w, bool force);
     friend class QApplicationPrivate;
 };
diff --git a/src/plugins/platforms/directfb/qdirectfbcursor.cpp b/src/plugins/platforms/directfb/qdirectfbcursor.cpp
index 2edae45..f2c9f35 100644
--- a/src/plugins/platforms/directfb/qdirectfbcursor.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbcursor.cpp
@@ -3,10 +3,10 @@
 
 
 QDirectFBCursor::QDirectFBCursor(QPlatformScreen* screen) :
-        QGraphicsSystemCursor(screen), surface(0)
+        QPlatformCursor(screen), surface(0)
 {
     QDirectFbConvenience::dfbInterface()->GetDisplayLayer(QDirectFbConvenience::dfbInterface(),DLID_PRIMARY, &m_layer);
-    image = new QGraphicsSystemCursorImage(0, 0, 0, 0, 0, 0);
+    image = new QPlatformCursorImage(0, 0, 0, 0, 0, 0);
 }
 
 void QDirectFBCursor::changeCursor(QCursor * cursor, QWidget * widget)
diff --git a/src/plugins/platforms/directfb/qdirectfbcursor.h b/src/plugins/platforms/directfb/qdirectfbcursor.h
index 1566e7c..6aecb16 100644
--- a/src/plugins/platforms/directfb/qdirectfbcursor.h
+++ b/src/plugins/platforms/directfb/qdirectfbcursor.h
@@ -1,12 +1,12 @@
 #ifndef QDIRECTFBCURSOR_H
 #define QDIRECTFBCURSOR_H
 
-#include <QGraphicsSystemCursor>
+#include <QPlatformCursor>
 #include <directfb.h>
 class QDirectFbScreen;
 class QDirectFbBlitter;
 
-class QDirectFBCursor : public QGraphicsSystemCursor
+class QDirectFBCursor : public QPlatformCursor
 {
 public:
     QDirectFBCursor(QPlatformScreen *screem);
@@ -15,7 +15,7 @@ public:
 private:
     IDirectFBDisplayLayer * m_layer;
     IDirectFBSurface * surface;
-    QGraphicsSystemCursorImage * image;
+    QPlatformCursorImage * image;
     QDirectFbBlitter *blitter;
 };
 
diff --git a/src/plugins/platforms/fb_base/fb_base.cpp b/src/plugins/platforms/fb_base/fb_base.cpp
index 213a710..ef7ab02 100644
--- a/src/plugins/platforms/fb_base/fb_base.cpp
+++ b/src/plugins/platforms/fb_base/fb_base.cpp
@@ -3,17 +3,17 @@
 #include <qpainter.h>
 #include <qdebug.h>
 #include <qbitmap.h>
-#include <QGraphicsSystemCursor>
+#include <QPlatformCursor>
 #include <QWindowSystemInterface>
 
-QGraphicsSystemSoftwareCursor::QGraphicsSystemSoftwareCursor(QPlatformScreen *scr)
-        : QGraphicsSystemCursor(scr), currentRect(QRect()), prevRect(QRect())
+QPlatformSoftwareCursor::QPlatformSoftwareCursor(QPlatformScreen *scr)
+        : QPlatformCursor(scr), currentRect(QRect()), prevRect(QRect())
 {
-    graphic = new QGraphicsSystemCursorImage(0, 0, 0, 0, 0, 0);
+    graphic = new QPlatformCursorImage(0, 0, 0, 0, 0, 0);
     setCursor(Qt::ArrowCursor);
 }
 
-QRect QGraphicsSystemSoftwareCursor::getCurrentRect()
+QRect QPlatformSoftwareCursor::getCurrentRect()
 {
     QRect rect = graphic->image()->rect().translated(-graphic->hotspot().x(),
                                                      -graphic->hotspot().y());
@@ -24,7 +24,7 @@ QRect QGraphicsSystemSoftwareCursor::getCurrentRect()
 }
 
 
-void QGraphicsSystemSoftwareCursor::pointerEvent(const QMouseEvent & e)
+void QPlatformSoftwareCursor::pointerEvent(const QMouseEvent & e)
 {
     Q_UNUSED(e);
     QPoint screenOffset = screen->geometry().topLeft();
@@ -35,7 +35,7 @@ void QGraphicsSystemSoftwareCursor::pointerEvent(const QMouseEvent & e)
     }
 }
 
-QRect QGraphicsSystemSoftwareCursor::drawCursor(QPainter & painter)
+QRect QPlatformSoftwareCursor::drawCursor(QPainter & painter)
 {
     dirty = false;
     if (currentRect.isNull())
@@ -53,7 +53,7 @@ QRect QGraphicsSystemSoftwareCursor::drawCursor(QPainter & painter)
     return prevRect;
 }
 
-QRect QGraphicsSystemSoftwareCursor::dirtyRect()
+QRect QPlatformSoftwareCursor::dirtyRect()
 {
     if (onScreen) {
         onScreen = false;
@@ -62,22 +62,22 @@ QRect QGraphicsSystemSoftwareCursor::dirtyRect()
     return QRect();
 }
 
-void QGraphicsSystemSoftwareCursor::setCursor(Qt::CursorShape shape)
+void QPlatformSoftwareCursor::setCursor(Qt::CursorShape shape)
 {
     graphic->set(shape);
 }
 
-void QGraphicsSystemSoftwareCursor::setCursor(const QImage * image, int hotx, int hoty)
+void QPlatformSoftwareCursor::setCursor(const QImage * image, int hotx, int hoty)
 {
     graphic->set(image, hotx, hoty);
 }
 
-void QGraphicsSystemSoftwareCursor::setCursor(const uchar *data, const uchar *mask, int width, int height, int hotX, int hotY)
+void QPlatformSoftwareCursor::setCursor(const uchar *data, const uchar *mask, int width, int height, int hotX, int hotY)
 {
     graphic->set(data, mask, width, height, hotX, hotY);
 }
 
-void QGraphicsSystemSoftwareCursor::changeCursor(QCursor * widgetCursor, QWidget * widget)
+void QPlatformSoftwareCursor::changeCursor(QCursor * widgetCursor, QWidget * widget)
 {
     Q_UNUSED(widget);
     Qt::CursorShape shape = widgetCursor->shape();
diff --git a/src/plugins/platforms/fb_base/fb_base.h b/src/plugins/platforms/fb_base/fb_base.h
index 3b5075d..10f292e 100644
--- a/src/plugins/platforms/fb_base/fb_base.h
+++ b/src/plugins/platforms/fb_base/fb_base.h
@@ -5,7 +5,7 @@
 #include <qimage.h>
 #include <qtimer.h>
 #include <qpainter.h>
-#include <QGraphicsSystemCursor>
+#include <QPlatformCursor>
 #include <QPlatformScreen>
 #include <QPlatformWindow>
 #include <QtGui/private/qwindowsurface_p.h>
@@ -16,10 +16,10 @@ class QPainter;
 
 class QFbScreen;
 
-class QGraphicsSystemSoftwareCursor : public QGraphicsSystemCursor
+class QPlatformSoftwareCursor : public QPlatformCursor
 {
 public:
-    QGraphicsSystemSoftwareCursor(QPlatformScreen * scr);
+    QPlatformSoftwareCursor(QPlatformScreen * scr);
 
     // output methods
     QRect dirtyRect();
@@ -35,7 +35,7 @@ public:
     virtual QRect lastPainted() { return prevRect; }
 
 protected:
-    QGraphicsSystemCursorImage * graphic;
+    QPlatformCursorImage * graphic;
 
 private:
     void setCursor(const uchar *data, const uchar *mask, int width, int height, int hotX, int hotY);
@@ -142,7 +142,7 @@ public:
 protected:
     QList<QFbWindow *> windowStack;
     QRegion repaintRegion;
-    QGraphicsSystemSoftwareCursor * cursor;
+    QPlatformSoftwareCursor * cursor;
     QTimer redrawTimer;
 
 protected slots:
diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
index f79f956..437af81 100644
--- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
+++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
@@ -811,7 +811,7 @@ QLinuxFbScreen::QLinuxFbScreen(uchar * d, int w,
                               mFormat);
     mFbScreenImage = new QImage(data, mGeometry.width(), mGeometry.height(),
                               bytesPerLine, mFormat);
-    cursor = new QGraphicsSystemSoftwareCursor(this);
+    cursor = new QPlatformSoftwareCursor(this);
 }
 
 void QLinuxFbScreen::setGeometry(QRect rect)
diff --git a/src/plugins/platforms/testlite/qtestliteintegration.cpp b/src/plugins/platforms/testlite/qtestliteintegration.cpp
index 46f2384..3f500c0 100644
--- a/src/plugins/platforms/testlite/qtestliteintegration.cpp
+++ b/src/plugins/platforms/testlite/qtestliteintegration.cpp
@@ -46,7 +46,7 @@
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <QtCore/qdebug.h>
 
-#include <QGraphicsSystemCursor>
+#include <QPlatformCursor>
 
 #include "qtestlitewindow.h"
 
@@ -59,10 +59,10 @@
 
 QT_BEGIN_NAMESPACE
 
-class MyCursor : QGraphicsSystemCursor
+class MyCursor : QPlatformCursor
 {
 public:
-    MyCursor(QPlatformScreen *screen) : QGraphicsSystemCursor(screen) {}
+    MyCursor(QPlatformScreen *screen) : QPlatformCursor(screen) {}
 
     void changeCursor(QCursor * cursor, QWidget * widget) {
         QTestLiteWindow *w = 0;
diff --git a/src/plugins/platforms/vnc/qvnccursor.cpp b/src/plugins/platforms/vnc/qvnccursor.cpp
index 72dcb25..e83696d 100644
--- a/src/plugins/platforms/vnc/qvnccursor.cpp
+++ b/src/plugins/platforms/vnc/qvnccursor.cpp
@@ -54,13 +54,13 @@
 QT_BEGIN_NAMESPACE
 
 QVNCCursor::QVNCCursor(QVNCServer * srvr, QVNCScreen *scr )
-        :QGraphicsSystemSoftwareCursor(scr), useVncCursor(false), server(srvr)
+        :QPlatformSoftwareCursor(scr), useVncCursor(false), server(srvr)
 {
 }
 
 void QVNCCursor::changeCursor(QCursor * widgetCursor, QWidget * widget)
 {
-    QGraphicsSystemSoftwareCursor::changeCursor(widgetCursor, widget);
+    QPlatformSoftwareCursor::changeCursor(widgetCursor, widget);
     if (useVncCursor) {
         server->setDirtyCursor();
     } else {
@@ -84,7 +84,7 @@ QRect QVNCCursor::drawCursor(QPainter & painter)
     if (useVncCursor)
         return QRect();
 
-    return QGraphicsSystemSoftwareCursor::drawCursor(painter);
+    return QPlatformSoftwareCursor::drawCursor(painter);
 }
 
 void QVNCCursor::clearClientCursor()
diff --git a/src/plugins/platforms/vnc/qvnccursor.h b/src/plugins/platforms/vnc/qvnccursor.h
index 2c6ff5b..eeb3686 100644
--- a/src/plugins/platforms/vnc/qvnccursor.h
+++ b/src/plugins/platforms/vnc/qvnccursor.h
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 class QVNCScreen;
 class QVNCServer;
 
-class QVNCCursor : public QGraphicsSystemSoftwareCursor {
+class QVNCCursor : public QPlatformSoftwareCursor {
 public:
     QVNCCursor(QVNCServer *, QVNCScreen *);