diff options
Diffstat (limited to 'tdecore/tdehw/tdestoragedevice.h')
| -rw-r--r-- | tdecore/tdehw/tdestoragedevice.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/tdecore/tdehw/tdestoragedevice.h b/tdecore/tdehw/tdestoragedevice.h index d6a4269a8..6bd39353b 100644 --- a/tdecore/tdehw/tdestoragedevice.h +++ b/tdecore/tdehw/tdestoragedevice.h @@ -21,6 +21,7 @@ #define _TDESTORAGEDEVICE_H #include "tdegenericdevice.h" +#include "tqvariant.h" struct crypt_device; @@ -166,9 +167,7 @@ enum TDELUKSResult { }; }; -class TQVariant; typedef TQMap<TQString, TQString> TDEStorageMountOptions; -typedef TQMap<TQString, TQVariant> TDEStorageOpResult; class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice { @@ -235,9 +234,9 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice * @param a TQString containing a requested mount name under /media, if desired * @param a TDEStorageMountOptions containing any mount options for pmount, if desired * - * @return a TDEStorageOpResult object containing information about the operation outcome + * @return a TQStringVariantMap object containing information about the operation outcome */ - TDEStorageOpResult mountDevice(TQString mediaName = TQString::null, + TQStringVariantMap mountDevice(TQString mediaName = TQString::null, TDEStorageMountOptions mountOptions = TDEStorageMountOptions()); /** @@ -247,17 +246,17 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice * @param a TQString containing a requested mount name under /media, if desired * @param a TDEStorageMountOptions containing any mount options for pmount, if desired * - * @return a TDEStorageOpResult object containing information about the operation outcome + * @return a TQStringVariantMap object containing information about the operation outcome */ - TDEStorageOpResult mountEncryptedDevice(TQString passphrase, TQString mediaName = TQString::null, + TQStringVariantMap mountEncryptedDevice(TQString passphrase, TQString mediaName = TQString::null, TDEStorageMountOptions mountOptions = TDEStorageMountOptions()); /** * Unmounts the device * - * @return a TDEStorageOpResult object containing information about the operation outcome + * @return a TQStringVariantMap object containing information about the operation outcome */ - TDEStorageOpResult unmountDevice(); + TQStringVariantMap unmountDevice(); /** * @return a TQString with the mount path, if mounted |