whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QEvdev: remove m_deviceDiscovery members 

They were never referenced outside the classes' ctor and, worse,
remained uninitialized if the specification string contained devices.

Change-Id: I977a156acf10190428da00fe128fee70cff8f98d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Marc Mutz 2019-06-12 23:58:36 +02:00
parent f1404c0ed1
commit 779f1ff9fa
8 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager.cpp
View File

@ -72,16 +72,15 @@ QEvdevKeyboardManager::QEvdevKeyboardManager(const QString &key, const QString &
if (parsed.devices.isEmpty()) {
qCDebug(qLcEvdevKey, "evdevkeyboard: Using device discovery");
m_deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Keyboard, this);
if (m_deviceDiscovery) {
if (auto deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Keyboard, this)) {
// scan and add already connected keyboards
const QStringList devices = m_deviceDiscovery->scanConnectedDevices();
const QStringList devices = deviceDiscovery->scanConnectedDevices();
for (const QString &device : devices)
addKeyboard(device);
connect(m_deviceDiscovery, &QDeviceDiscovery::deviceDetected,
connect(deviceDiscovery, &QDeviceDiscovery::deviceDetected,
this, &QEvdevKeyboardManager::addKeyboard);
connect(m_deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
connect(deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
this, &QEvdevKeyboardManager::removeKeyboard);
}
}

1
src/platformsupport/input/evdevkeyboard/qevdevkeyboardmanager_p.h
View File

@ -79,7 +79,6 @@ private:
QString m_spec;
QtInputSupport::DeviceHandlerList<QEvdevKeyboardHandler> m_keyboards;
QDeviceDiscovery *m_deviceDiscovery;
QString m_defaultKeymapFile;
};

9
src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
View File

@ -82,16 +82,15 @@ QEvdevMouseManager::QEvdevMouseManager(const QString &key, const QString &specif
if (parsed.devices.isEmpty()) {
qCDebug(qLcEvdevMouse, "evdevmouse: Using device discovery");
m_deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Mouse | QDeviceDiscovery::Device_Touchpad, this);
if (m_deviceDiscovery) {
if (auto deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Mouse | QDeviceDiscovery::Device_Touchpad, this)) {
// scan and add already connected keyboards
const QStringList devices = m_deviceDiscovery->scanConnectedDevices();
const QStringList devices = deviceDiscovery->scanConnectedDevices();
for (const QString &device : devices)
addMouse(device);
connect(m_deviceDiscovery, &QDeviceDiscovery::deviceDetected,
connect(deviceDiscovery, &QDeviceDiscovery::deviceDetected,
this, &QEvdevMouseManager::addMouse);
connect(m_deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
connect(deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
this, &QEvdevMouseManager::removeMouse);
}
}

1
src/platformsupport/input/evdevmouse/qevdevmousemanager_p.h
View File

@ -83,7 +83,6 @@ private:
QString m_spec;
QtInputSupport::DeviceHandlerList<QEvdevMouseHandler> m_mice;
QDeviceDiscovery *m_deviceDiscovery;
int m_x;
int m_y;
int m_xoffset;

9
src/platformsupport/input/evdevtablet/qevdevtabletmanager.cpp
View File

@ -76,15 +76,14 @@ QEvdevTabletManager::QEvdevTabletManager(const QString &key, const QString &spec
// when no devices specified, use device discovery to scan and monitor
if (parsed.devices.isEmpty()) {
qCDebug(qLcEvdevTablet, "evdevtablet: Using device discovery");
m_deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Tablet, this);
if (m_deviceDiscovery) {
const QStringList devices = m_deviceDiscovery->scanConnectedDevices();
if (auto deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Tablet, this)) {
const QStringList devices = deviceDiscovery->scanConnectedDevices();
for (const QString &device : devices)
addDevice(device);
connect(m_deviceDiscovery, &QDeviceDiscovery::deviceDetected,
connect(deviceDiscovery, &QDeviceDiscovery::deviceDetected,
this, &QEvdevTabletManager::addDevice);
connect(m_deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
connect(deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
this, &QEvdevTabletManager::removeDevice);
}
}

1
src/platformsupport/input/evdevtablet/qevdevtabletmanager_p.h
View File

@ -75,7 +75,6 @@ private:
void updateDeviceCount();
QString m_spec;
QDeviceDiscovery *m_deviceDiscovery;
QtInputSupport::DeviceHandlerList<QEvdevTabletHandlerThread> m_activeDevices;
};

9
src/platformsupport/input/evdevtouch/qevdevtouchmanager.cpp
View File

@ -76,15 +76,14 @@ QEvdevTouchManager::QEvdevTouchManager(const QString &key, const QString &specif
// when no devices specified, use device discovery to scan and monitor
if (parsed.devices.isEmpty()) {
qCDebug(qLcEvdevTouch, "evdevtouch: Using device discovery");
m_deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Touchpad | QDeviceDiscovery::Device_Touchscreen, this);
if (m_deviceDiscovery) {
const QStringList devices = m_deviceDiscovery->scanConnectedDevices();
if (auto deviceDiscovery = QDeviceDiscovery::create(QDeviceDiscovery::Device_Touchpad | QDeviceDiscovery::Device_Touchscreen, this)) {
const QStringList devices = deviceDiscovery->scanConnectedDevices();
for (const QString &device : devices)
addDevice(device);
connect(m_deviceDiscovery, &QDeviceDiscovery::deviceDetected,
connect(deviceDiscovery, &QDeviceDiscovery::deviceDetected,
this, &QEvdevTouchManager::addDevice);
connect(m_deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
connect(deviceDiscovery, &QDeviceDiscovery::deviceRemoved,
this, &QEvdevTouchManager::removeDevice);
}
}

1
src/platformsupport/input/evdevtouch/qevdevtouchmanager_p.h
View File

@ -75,7 +75,6 @@ public:
private:
QString m_spec;
QDeviceDiscovery *m_deviceDiscovery;
QtInputSupport::DeviceHandlerList<QEvdevTouchScreenHandlerThread> m_activeDevices;
};