142e058e | 2014-04-18 15:41:06 | Timothy Pearson |
Add detailedFriendlyName methods to the TDE hardware manager This breaks the ABI and relates to Bug 1666 |
||
M tdecore/tdehw/tdegenericdevice.cpp M tdecore/tdehw/tdegenericdevice.h M tdecore/tdehw/tdestoragedevice.cpp M tdecore/tdehw/tdestoragedevice.h |
||
diff --git a/tdecore/tdehw/tdegenericdevice.cpp b/tdecore/tdehw/tdegenericdevice.cpp index 4e67ed6..8662e5e 100644 --- a/tdecore/tdehw/tdegenericdevice.cpp +++ b/tdecore/tdehw/tdegenericdevice.cpp @@ -334,4 +334,8 @@ return m_friendlyName; } +TQString TDEGenericDevice::detailedFriendlyName() { + return friendlyName(); +} + #include "tdegenericdevice.moc" diff --git a/tdecore/tdehw/tdegenericdevice.h b/tdecore/tdehw/tdegenericdevice.h index f2abd55..7536b44 100644 --- a/tdecore/tdehw/tdegenericdevice.h +++ b/tdecore/tdehw/tdegenericdevice.h @@ -78,6 +78,14 @@ virtual TQString friendlyName(); /** + * @return a TQString with a detailed friendly name + * + * In most cases this will return exactly the same string as friendlyName(), however + * for certain devices (e.g. disks) this method will provide additional information + */ + virtual TQString detailedFriendlyName(); + + /** * @return a TQString with the device bus name, if any */ TQString deviceBus(); diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp index 36712cb..b22996b 100644 --- a/tdecore/tdehw/tdestoragedevice.cpp +++ b/tdecore/tdehw/tdestoragedevice.cpp @@ -538,6 +538,10 @@ return friendlyDeviceType(); } +TQString TDEStorageDevice::detailedFriendlyName() { + return TQString("%1 [%2]").arg(friendlyName()).arg(deviceNode()); +} + TQString TDEStorageDevice::friendlyDeviceType() { TQString ret = i18n("Hard Disk Drive"); diff --git a/tdecore/tdehw/tdestoragedevice.h b/tdecore/tdehw/tdestoragedevice.h index 1199510..b3a7076 100644 --- a/tdecore/tdehw/tdestoragedevice.h +++ b/tdecore/tdehw/tdestoragedevice.h @@ -252,6 +252,13 @@ TQString friendlyName(); /** + * @return a TQString with a detailed friendly name + * + * This method overrides TDEGenericDevice::detailedFriendlyName() + */ + TQString detailedFriendlyName(); + + /** * @return a TQString containing the friendly type name * * This method overrides TDEGenericDevice::friendlyDeviceType() |