diff options
| author | Alexander Golubev <fatzer2@gmail.com> | 2013-08-11 02:35:58 +0400 |
|---|---|---|
| committer | Alexander Golubev <fatzer2@gmail.com> | 2013-08-11 02:35:58 +0400 |
| commit | b7ff6c33309224a4e598a0691e7cb2dc353a6ace (patch) | |
| tree | bc003a5aeba3b0980b5098985f6c28ba965b8b52 /tdecore/tdehw/tdestoragedevice.h | |
| parent | 34f10b970c1e644842ef737b5504591997e37d59 (diff) | |
| parent | 411486cc50448e91b53d28119ccec54c5c2305cd (diff) | |
| download | tdelibs-b7ff6c33309224a4e598a0691e7cb2dc353a6ace.tar.gz tdelibs-b7ff6c33309224a4e598a0691e7cb2dc353a6ace.zip | |
Merge branch 'master' into HEAD
Conflicts:
tdecore/CMakeLists.txt
tdecore/tdehardwaredevices.h
tdecore/tdehw/tdehardwaredevices.cpp
Diffstat (limited to 'tdecore/tdehw/tdestoragedevice.h')
| -rw-r--r-- | tdecore/tdehw/tdestoragedevice.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tdecore/tdehw/tdestoragedevice.h b/tdecore/tdehw/tdestoragedevice.h index 0f33b03dc..7c80f5ea5 100644 --- a/tdecore/tdehw/tdestoragedevice.h +++ b/tdecore/tdehw/tdestoragedevice.h @@ -105,6 +105,8 @@ inline TDEDiskDeviceStatus operator~(TDEDiskDeviceStatus a) } }; +typedef TQMap<TQString,TQString> TDEStorageMountOptions; + class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice { public: @@ -174,7 +176,7 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice * * @return a TQString with the mount path, if successful */ - TQString mountDevice(TQString mediaName=TQString::null, TQString mountOptions=TQString::null, TQString* errRet=0, int* retcode=0); + TQString mountDevice(TQString mediaName=TQString::null, TDEStorageMountOptions mountOptions=TDEStorageMountOptions(), TQString* errRet=0, int* retcode=0); /** * Mounts the encrypted device if the correct passphrase is given @@ -187,7 +189,7 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice * * @return a TQString with the mount path, if successful */ - TQString mountEncryptedDevice(TQString passphrase, TQString mediaName=TQString::null, TQString mountOptions=TQString::null, TQString* errRet=0, int* retcode=0); + TQString mountEncryptedDevice(TQString passphrase, TQString mediaName=TQString::null, TDEStorageMountOptions mountOptions=TDEStorageMountOptions(), TQString* errRet=0, int* retcode=0); /** * Unmounts the device |