Differential D21379 Diff 58584 src/solid/devices/backends/udev/udevmanager.cpp

Changeset View

Standalone View

View Options

src/solid/devices/backends/udev/udevmanager.cpp

Show First 20 Lines • Show All 193 Lines • ▼ Show 20 Line(s)177{
194 194​
195 UdevQt::DeviceList deviceList; 195​ UdevQt::DeviceList deviceList;
196 196​
197 // Already limit the number of devices we query and have to create wrapper items for here 197​ // Already limit the number of devices we query and have to create wrapper items for here
198 if (type == Solid::DeviceInterface::Processor) { 198​ if (type == Solid::DeviceInterface::Processor) {
199 deviceList = d->m_client->devicesBySubsystem(QStringLiteral("processor")) 199​ deviceList = d->m_client->devicesBySubsystem(QStringLiteral("processor"))
200 + d->m_client->devicesBySubsystem(QStringLiteral("cpu")); 200​ + d->m_client->devicesBySubsystem(QStringLiteral("cpu"));
201 } else if (type == Solid::DeviceInterface::Camera) { 201​ } else if (type == Solid::DeviceInterface::Camera) {
202 deviceList = d->m_client->devicesByProperty("ID_GPHOTO2", 1); 202​ deviceList = d->m_client->devicesBySubsystemsAndProperties({
203​ QStringLiteral("usb"),
204​ QStringLiteral("dvb"),
205​ QStringLiteral("tty")
206​ }, {
207​ {QStringLiteral("ID_GPHOTO2"), 1}
208​ });
203 } else if (type == Solid::DeviceInterface::PortableMediaPlayer) { 209​ } else if (type == Solid::DeviceInterface::PortableMediaPlayer) {
204 deviceList = d->m_client->devicesBySubsystem(QStringLiteral("usb")); 210​ deviceList = d->m_client->devicesBySubsystem(QStringLiteral("usb"));
205 } else if (type != Solid::DeviceInterface::Unknown) { 211​ } else if (type != Solid::DeviceInterface::Unknown) {
206 deviceList = d->m_client->allDevices(); 212​ deviceList = d->m_client->allDevices();
207 } 213​ }
208 214​
209 for (const UdevQt::Device &dev : qAsConst(deviceList)) { 215​ for (const UdevQt::Device &dev : qAsConst(deviceList)) {
210 UDevDevice device(dev); 216​ UDevDevice device(dev);
▲ Show 20 Lines • Show All 43 Lines • Show Last 20 Lines