diff --git a/solid/solid/backends/udev/udevdevice.cpp b/solid/solid/backends/udev/udevdevice.cpp index c7bc773a..4e3e6fdd 100644 --- a/solid/solid/backends/udev/udevdevice.cpp +++ b/solid/solid/backends/udev/udevdevice.cpp @@ -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; diff --git a/solid/solid/backends/udev/udevdevice.h b/solid/solid/backends/udev/udevdevice.h index 4b97861c..b00d3604 100644 --- a/solid/solid/backends/udev/udevdevice.h +++ b/solid/solid/backends/udev/udevdevice.h @@ -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;