From c99bee92a096e879bd7968412418419278800423 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 26 Apr 2022 15:38:53 +0200 Subject: [PATCH] QDeviceDiscoveryUDev: use NSDMI This also fixes 0-used-as-nullptr warnings from clang-tidy. Change-Id: Ibf10f1719a6c8cf22046cf30298dadb307a853d5 Reviewed-by: Edward Welbourne (cherry picked from commit 401041f958c9a6a9535eb4590e8c4009cc491b5b) Reviewed-by: Qt Cherry-pick Bot --- .../devicediscovery/qdevicediscovery_udev.cpp | 2 +- .../devicediscovery/qdevicediscovery_udev_p.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp b/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp index 4c6225a3547..45043818a41 100644 --- a/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp +++ b/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp @@ -41,7 +41,7 @@ QDeviceDiscovery *QDeviceDiscovery::create(QDeviceTypes types, QObject *parent) QDeviceDiscoveryUDev::QDeviceDiscoveryUDev(QDeviceTypes types, struct udev *udev, QObject *parent) : QDeviceDiscovery(types, parent), - m_udev(udev), m_udevMonitor(0), m_udevMonitorFileDescriptor(-1), m_udevSocketNotifier(0) + m_udev(udev) { if (!m_udev) return; diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h b/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h index c03dd88cec5..3074877b5a4 100644 --- a/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h +++ b/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h @@ -41,9 +41,9 @@ private: void startWatching(); void stopWatching(); - struct udev_monitor *m_udevMonitor; - int m_udevMonitorFileDescriptor; - QSocketNotifier *m_udevSocketNotifier; + struct udev_monitor *m_udevMonitor = nullptr; + int m_udevMonitorFileDescriptor = -1; + QSocketNotifier *m_udevSocketNotifier = nullptr; }; QT_END_NAMESPACE