1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDeviceDiscoveryUDev: use NSDMI

Browse Source 
This also fixes 0-used-as-nullptr warnings from clang-tidy.

Change-Id: Ibf10f1719a6c8cf22046cf30298dadb307a853d5
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 401041f958c9a6a9535eb4590e8c4009cc491b5b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2022-04-26 15:38:53 +02:00 committed by Qt Cherry-pick Bot
parent 4260287620
commit c99bee92a0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp
View File

@ -41,7 +41,7 @@ QDeviceDiscovery *QDeviceDiscovery::create(QDeviceTypes types, QObject *parent)
QDeviceDiscoveryUDev::QDeviceDiscoveryUDev(QDeviceTypes types, struct udev *udev, QObject *parent) : QDeviceDiscoveryUDev::QDeviceDiscoveryUDev(QDeviceTypes types, struct udev *udev, QObject *parent) :
QDeviceDiscovery(types, parent), QDeviceDiscovery(types, parent),
m_udev(udev), m_udevMonitor(0), m_udevMonitorFileDescriptor(-1), m_udevSocketNotifier(0) m_udev(udev)
{ {
if (!m_udev) if (!m_udev)
return; return;

6
src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h
View File

@ -41,9 +41,9 @@ private:
void startWatching(); void startWatching();
void stopWatching(); void stopWatching();
struct udev_monitor *m_udevMonitor; struct udev_monitor *m_udevMonitor = nullptr;
int m_udevMonitorFileDescriptor; int m_udevMonitorFileDescriptor = -1;
QSocketNotifier *m_udevSocketNotifier; QSocketNotifier *m_udevSocketNotifier = nullptr;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE