--- src/gui/osutils/nixutils/DeviceListenerLibUsb.cpp.orig	2024-05-23 07:16:45 UTC

+++ src/gui/osutils/nixutils/DeviceListenerLibUsb.cpp

@@ -66,7 +66,7 @@ int DeviceListenerLibUsb::registerHotplugCallback(bool

         events |= LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT;

     }

-    int handle = 0;

+    Handle handle = 0;

     const QPointer that = this;

     const int ret = libusb_hotplug_register_callback(

         static_cast<libusb_context*>(m_ctx),

@@ -84,7 +84,7 @@ int DeviceListenerLibUsb::registerHotplugCallback(bool

             return 0;

         },

         that,

-        &handle);

+        reinterpret_cast<libusb_hotplug_callback_handle *>(&handle));

     if (ret != LIBUSB_SUCCESS) {

         qWarning("Failed to register USB listener callback.");

         handle = 0;

@@ -102,12 +102,12 @@ int DeviceListenerLibUsb::registerHotplugCallback(bool

     return handle;

 }

-void DeviceListenerLibUsb::deregisterHotplugCallback(int handle)

+void DeviceListenerLibUsb::deregisterHotplugCallback(Handle handle)

 {

     if (!m_ctx || !m_callbackHandles.contains(handle)) {

         return;

     }

-    libusb_hotplug_deregister_callback(static_cast<libusb_context*>(m_ctx), handle);

+    libusb_hotplug_deregister_callback(static_cast<libusb_context*>(m_ctx), (libusb_hotplug_callback_handle)handle);

     m_callbackHandles.remove(handle);

     if (m_callbackHandles.isEmpty() && m_usbEvents.isRunning()) {

--- src/gui/osutils/nixutils/DeviceListenerLibUsb.h.orig	2024-05-05 20:40:29 UTC

+++ src/gui/osutils/nixutils/DeviceListenerLibUsb.h

@@ -32,12 +32,13 @@ class DeviceListenerLibUsb : public QObject (public)

     Q_OBJECT

 public:

+    typedef qintptr Handle;

     explicit DeviceListenerLibUsb(QWidget* parent);

     DeviceListenerLibUsb(const DeviceListenerLibUsb&) = delete;

     ~DeviceListenerLibUsb() override;

     int registerHotplugCallback(bool arrived, bool left, int vendorId = -1, int productId = -1, const QUuid* = nullptr);

-    void deregisterHotplugCallback(int handle);

+    void deregisterHotplugCallback(Handle handle);

     void deregisterAllHotplugCallbacks();

 signals:

@@ -45,7 +46,7 @@ signals: (private)

 private:

     void* m_ctx;

-    QSet<int> m_callbackHandles;

+    QSet<Handle> m_callbackHandles;

     QFuture<void> m_usbEvents;

     QAtomicInt m_completed;

 };