From a001c6c5172485f110519e5df9507a10f7105cac Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Sun, 11 Jun 2023 23:39:25 +0300
Subject: [PATCH] kcontrol: remove unused PreviewCursor::handle() method

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 kcontrol/input/xcursor/previewwidget.cpp | 64 ++++++++++--------------
 1 file changed, 26 insertions(+), 38 deletions(-)

diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp
index c55701c0..8337e399 100644
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@@ -17,44 +17,34 @@
  */
 
 #include <QPainter>
-#include <QtGui/qevent.h>
+#include <QResizeEvent>
 
 #include "previewwidget.h"
-
-#include <X11/Xlib.h>
-#include <X11/Xcursor/Xcursor.h>
-
 #include "cursortheme.h"
 
+// Preview cursors
+const char * const cursor_names[] =
+{
+    "left_ptr",
+    "left_ptr_watch",
+    "wait",
+    "pointing_hand",
+    "whats_this",
+    "ibeam",
+    "size_all",
+    "size_fdiag",
+    "cross",
+    "split_h",
+    "size_ver",
+    "size_hor",
+    "size_bdiag",
+    "split_v",
+};
 
-
-namespace {
-
-    // Preview cursors
-    const char * const cursor_names[] =
-    {
-        "left_ptr",
-        "left_ptr_watch",
-        "wait",
-        "pointing_hand",
-        "whats_this",
-        "ibeam",
-        "size_all",
-        "size_fdiag",
-        "cross",
-        "split_h",
-        "size_ver",
-        "size_hor",
-        "size_bdiag",
-        "split_v",
-    };
-
-    const int numCursors      = 9;     // The number of cursors from the above list to be previewed
-    const int cursorSpacing   = 20;    // Spacing between preview cursors
-    const int widgetMinWidth  = 10;    // The minimum width of the preview widget
-    const int widgetMinHeight = 48;    // The minimum height of the preview widget
-}
-
+const int numCursors      = 9;     // The number of cursors from the above list to be previewed
+const int cursorSpacing   = 20;    // Spacing between preview cursors
+const int widgetMinWidth  = 10;    // The minimum width of the preview widget
+const int widgetMinHeight = 48;    // The minimum height of the preview widget
 
 class PreviewCursor
 {
@@ -62,16 +52,14 @@ class PreviewCursor
         PreviewCursor( const CursorTheme *theme, const QString &name, int size );
         ~PreviewCursor() {}
 
+        const QCursor &cursor() const { return m_cursor; }
         const QPixmap &pixmap() const { return m_pixmap; }
-        Cursor handle() const { return m_cursor.handle(); }
         int width() const { return m_pixmap.width(); }
         int height() const { return m_pixmap.height(); }
         inline QRect rect() const;
         void setPosition( const QPoint &p ) { m_pos = p; }
         void setPosition( int x, int y ) { m_pos = QPoint(x, y); }
         QPoint position() const { return m_pos; }
-        operator const QCursor& () const { return m_cursor; }
-        operator const QPixmap& () const { return pixmap(); }
 
     private:
         QPixmap m_pixmap;
@@ -193,7 +181,7 @@ void PreviewWidget::paintEvent(QPaintEvent *)
         if (c->pixmap().isNull())
             continue;
 
-        p.drawPixmap(c->position(), *c);
+        p.drawPixmap(c->position(), c->pixmap());
     }
 }
 
@@ -209,7 +197,7 @@ void PreviewWidget::mouseMoveEvent(QMouseEvent *e)
         {
             if (c != current)
             {
-                setCursor(*c);
+                setCursor(c->cursor());
                 current = c;
             }
             return;