Refactored QGraphicsSystemCursor -> QPlatformCursor

2 files changed, 17 insertions, 17 deletions

diff --git a/src/plugins/platforms/fb_base/fb_base.cpp b/src/plugins/platforms/fb_base/fb_base.cpp
index 213a7107d2..ef7ab02621 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 3b5075df80..10f292e412 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: