Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 10:22:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

solid: remove redundant Solid::Backends::UDev::UDevDevice::devicePath() method

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-09-08 07:31:29 +03:00
parent 2da2e7ddb6
commit 0fc1865606
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
solid/solid/backends/udev/udevdevice.cpp
View file

@ -65,7 +65,7 @@ UDevDevice::~UDevDevice()
QString UDevDevice::udi() const
{
return devicePath();
return QString::fromLatin1(UDEV_UDI_PREFIX) + deviceName();
}
QString UDevDevice::parentUdi() const
@ -76,7 +76,7 @@ QString UDevDevice::parentUdi() const
// for partitions but another device UDI related to this device, has to be fixed and verified
// to work at some point
if (m_device.subsystem() == "block" || idcdrom == 1) {
return devicePath();
return udi();
}
return QString::fromLatin1(UDEV_UDI_PREFIX);
@ -685,11 +685,6 @@ int UDevDevice::deviceNumber() const
return m_device.sysfsNumber();
}
QString UDevDevice::devicePath() const
{
return QString::fromLatin1(UDEV_UDI_PREFIX) + deviceName();
}
UdevQt::Device UDevDevice::udevDevice() const
{
return m_device;

1
solid/solid/backends/udev/udevdevice.h
View file

@ -54,7 +54,6 @@ public:
QString deviceProperty(const QByteArray &key) const;
bool devicePropertyExists(const QByteArray &key) const;
QString deviceName() const;
QString devicePath() const;
int deviceNumber() const;
UdevQt::Device udevDevice() const;