diff options
Diffstat (limited to 'tdecore/tdehw/tdestoragedevice.cpp')
| -rw-r--r-- | tdecore/tdehw/tdestoragedevice.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp index c21f54606..16e6d6e4d 100644 --- a/tdecore/tdehw/tdestoragedevice.cpp +++ b/tdecore/tdehw/tdestoragedevice.cpp @@ -28,7 +28,6 @@ #include <tqregexp.h> #include <tqpixmap.h> #include <tqfile.h> -#include <tqvariant.h> #include "kdebug.h" #include "tdelocale.h" @@ -310,7 +309,7 @@ bool TDEStorageDevice::lockDriveMedia(bool lock) { bool TDEStorageDevice::ejectDrive() { if (!(TDEGlobal::dirs()->findExe("udisksctl").isEmpty())) { - TDEStorageOpResult ejectResult = UDisks2EjectDrive(this); + TQStringVariantMap ejectResult = UDisks2EjectDrive(this); if (ejectResult["result"].toBool()) { return true; } @@ -320,7 +319,7 @@ bool TDEStorageDevice::ejectDrive() { } } if (!(TDEGlobal::dirs()->findExe("udisks").isEmpty())) { - TDEStorageOpResult ejectResult = UDisksEjectDrive(this); + TQStringVariantMap ejectResult = UDisksEjectDrive(this); if (ejectResult["result"].toBool()) { return true; } @@ -702,8 +701,8 @@ TQString TDEStorageDevice::mountPath() { return TQString::null; } -TDEStorageOpResult TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageMountOptions mountOptions) { - TDEStorageOpResult result; +TQStringVariantMap TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageMountOptions mountOptions) { + TQStringVariantMap result; // Check if device is already mounted TQString mountpath = mountPath(); @@ -774,7 +773,7 @@ TDEStorageOpResult TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageM fileSystemType = mountOptions["filesystem"]; } - TDEStorageOpResult mountResult = UDisks2MountDrive(devNode, fileSystemType, optionString); + TQStringVariantMap mountResult = UDisks2MountDrive(devNode, fileSystemType, optionString); if (mountResult["result"].toBool()) { // Update internal mount data TDEGlobal::hardwareDevices()->processModifiedMounts(); @@ -901,9 +900,9 @@ TDEStorageOpResult TDEStorageDevice::mountDevice(TQString mediaName, TDEStorageM return result; } -TDEStorageOpResult TDEStorageDevice::mountEncryptedDevice(TQString passphrase, TQString mediaName, +TQStringVariantMap TDEStorageDevice::mountEncryptedDevice(TQString passphrase, TQString mediaName, TDEStorageMountOptions mountOptions) { - TDEStorageOpResult result; + TQStringVariantMap result; // Check if device is already mounted TQString mountpath = mountPath(); @@ -976,8 +975,8 @@ TDEStorageOpResult TDEStorageDevice::mountEncryptedDevice(TQString passphrase, T return result; } -TDEStorageOpResult TDEStorageDevice::unmountDevice() { - TDEStorageOpResult result; +TQStringVariantMap TDEStorageDevice::unmountDevice() { + TQStringVariantMap result; // Check if device is already unmounted TQString mountpoint = mountPath(); @@ -990,7 +989,7 @@ TDEStorageOpResult TDEStorageDevice::unmountDevice() { TQString devNode = deviceNode(); // Try to use UDISKS v2 via DBUS, if available - TDEStorageOpResult unmountResult = UDisks2UnmountDrive(devNode, TQString::null); + TQStringVariantMap unmountResult = UDisks2UnmountDrive(devNode, TQString::null); if (unmountResult["result"].toBool()) { // Update internal mount data TDEGlobal::hardwareDevices()->processModifiedMounts(); |