diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2013-03-02 15:57:34 -0600 |
| commit | 7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch) | |
| tree | c76702a7f6310fbe9d437e347535422e836e94e9 /tdecore/tdehardwaredevices.h | |
| parent | a2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff) | |
| parent | 27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff) | |
| download | tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/tdehardwaredevices.h')
| -rw-r--r-- | tdecore/tdehardwaredevices.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tdecore/tdehardwaredevices.h b/tdecore/tdehardwaredevices.h index b6d0dd5ef..0363596e4 100644 --- a/tdecore/tdehardwaredevices.h +++ b/tdecore/tdehardwaredevices.h @@ -353,10 +353,10 @@ class TDECORE_EXPORT TDEGenericDevice : public TQObject /** * Get an icon for this device - * @param size a KIcon::StdSizes structure specifying the desired icon size + * @param size a TDEIcon::StdSizes structure specifying the desired icon size * @return a TQPixmap containing the icon for the specified type */ - virtual TQPixmap icon(KIcon::StdSizes size); + virtual TQPixmap icon(TDEIcon::StdSizes size); protected: /** @@ -622,12 +622,12 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice /** * Get an icon for this device - * @param size a KIcon::StdSizes structure specifying the desired icon size + * @param size a TDEIcon::StdSizes structure specifying the desired icon size * @return a TQPixmap containing the icon for the specified type * - * This method overrides TDEGenericDevice::icon(KIcon::StdSizes size) + * This method overrides TDEGenericDevice::icon(TDEIcon::StdSizes size) */ - TQPixmap icon(KIcon::StdSizes size); + TQPixmap icon(TDEIcon::StdSizes size); /** * @return a TQString with a friendly name @@ -1977,10 +1977,10 @@ class TDECORE_EXPORT TDEHardwareDevices : public TQObject /** * Get an icon for a device type * @param query a TDEGenericDeviceType::TDEGenericDeviceType specifying a device type - * @param size a KIcon::StdSizes structure specifying the desired icon size + * @param size a TDEIcon::StdSizes structure specifying the desired icon size * @return a TQPixmap containing the icon for the specified type */ - TQPixmap getDeviceTypeIconFromType(TDEGenericDeviceType::TDEGenericDeviceType query, KIcon::StdSizes size); + TQPixmap getDeviceTypeIconFromType(TDEGenericDeviceType::TDEGenericDeviceType query, TDEIcon::StdSizes size); /** * Convenience function to obtain the root system device |