From ae554cb8c2ba41c4285951abb9c9b0bc9a7d47e5 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Mon, 2 Mar 2015 12:18:57 +0100
Subject: [PATCH] Windows plugin: Simplify cursor code in platform screen.

Change the shared pointer to store a QPlatformCursor instead of
QWindowsCursor, removing the dependency of qwindowsscreen.h on
qwindowscursor.h.

Change-Id: I8b4bbc9fd4d5046c30ac3784f14229a9cc6d8dc6
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 src/plugins/platforms/windows/qwindowsscreen.cpp |  6 +++---
 src/plugins/platforms/windows/qwindowsscreen.h   | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp
index 4ab4ac352e..28e2aadf14 100644
--- a/src/plugins/platforms/windows/qwindowsscreen.cpp
+++ b/src/plugins/platforms/windows/qwindowsscreen.cpp
@@ -191,13 +191,13 @@ static QDebug operator<<(QDebug dbg, const QWindowsScreenData &d)
 }
 
 // Return the cursor to be shared by all screens (virtual desktop).
-static inline QSharedPointer<QWindowsCursor> sharedCursor()
+static inline QSharedPointer<QPlatformCursor> sharedCursor()
 {
 #ifndef QT_NO_CURSOR
     if (const QScreen *primaryScreen = QGuiApplication::primaryScreen())
-        return static_cast<const QWindowsScreen *>(primaryScreen->handle())->windowsCursor();
+        return static_cast<const QWindowsScreen *>(primaryScreen->handle())->cursorPtr();
 #endif
-    return QSharedPointer<QWindowsCursor>(new QWindowsCursor);
+    return QSharedPointer<QPlatformCursor>(new QWindowsCursor);
 }
 
 /*!
diff --git a/src/plugins/platforms/windows/qwindowsscreen.h b/src/plugins/platforms/windows/qwindowsscreen.h
index b561f73804..7352c45777 100644
--- a/src/plugins/platforms/windows/qwindowsscreen.h
+++ b/src/plugins/platforms/windows/qwindowsscreen.h
@@ -34,8 +34,8 @@
 #ifndef QWINDOWSSCREEN_H
 #define QWINDOWSSCREEN_H
 
-#include "qwindowscursor.h"
 #include "qwindowsscaling.h"
+#include "qtwindowsglobal.h"
 #ifdef Q_OS_WINCE
 #  include "qplatformfunctions_wince.h"
 #endif
@@ -75,7 +75,7 @@ class QWindowsScreen : public QPlatformScreen
 {
 public:
 #ifndef QT_NO_CURSOR
-    typedef QSharedPointer<QWindowsCursor> WindowsCursorPtr;
+    typedef QSharedPointer<QPlatformCursor> CursorPtr;
 #endif
 
     explicit QWindowsScreen(const QWindowsScreenData &data);
@@ -105,8 +105,8 @@ public:
     inline void handleChanges(const QWindowsScreenData &newData);
 
 #ifndef QT_NO_CURSOR
-    QPlatformCursor *cursor() const               { return m_cursor.data(); }
-    const WindowsCursorPtr &windowsCursor() const { return m_cursor; }
+    QPlatformCursor *cursor() const Q_DECL_OVERRIDE { return m_cursor.data(); }
+    const CursorPtr &cursorPtr() const { return m_cursor; }
 #else
     QPlatformCursor *cursor() const               { return 0; }
 #endif // !QT_NO_CURSOR
@@ -117,7 +117,7 @@ public:
 private:
     QWindowsScreenData m_data;
 #ifndef QT_NO_CURSOR
-    const WindowsCursorPtr m_cursor;
+    const CursorPtr m_cursor;
 #endif
 };