summaryrefslogtreecommitdiffstats
path: root/tdeioslave/media/mediamanager
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2019-06-01 13:46:23 +0900
committerMichele Calgaro <[email protected]>2019-07-08 10:33:33 +0900
commit7d2c7f0621177487fcc3953921788f7cafc509af (patch)
tree391ec3fe2be390cdad396ba52e50e904b7ab75d4 /tdeioslave/media/mediamanager
parentdf9e4e43b0e3e9945d9b32c1b0683314239d1476 (diff)
downloadtdebase-7d2c7f0621177487fcc3953921788f7cafc509af.tar.gz
tdebase-7d2c7f0621177487fcc3953921788f7cafc509af.zip
Adjusted to use new TQStringVariantMap type.
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'tdeioslave/media/mediamanager')
-rw-r--r--tdeioslave/media/mediamanager/tdehardwarebackend.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index 034bf6709..33d1fe455 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -1233,7 +1233,7 @@ TQString TDEBackend::mount(const Medium *medium)
if (!medium->isEncrypted()) {
// normal volume
- TDEStorageOpResult mountResult = sdevice->mountDevice(diskLabel, valids);
+ TQStringVariantMap mountResult = sdevice->mountDevice(diskLabel, valids);
TQString mountedPath = mountResult.contains("mountPath") ? mountResult["mountPath"].toString() : TQString::null;
if (mountedPath.isEmpty()) {
qerror = i18n("<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper device and/or user privilege level<br>Corrupt data on storage device");
@@ -1286,7 +1286,7 @@ TQString TDEBackend::mount(const Medium *medium)
}
// mount encrypted volume with password
- TDEStorageOpResult mountResult = sdevice->mountEncryptedDevice(m_decryptionPassword, diskLabel, valids);
+ TQStringVariantMap mountResult = sdevice->mountEncryptedDevice(m_decryptionPassword, diskLabel, valids);
TQString mountedPath = mountResult.contains("mountPath") ? mountResult["mountPath"].toString() : TQString::null;
if (mountedPath.isEmpty()) {
if (mountResult.contains("retCode") && mountResult["retCode"].toInt() == 0) {
@@ -1400,7 +1400,7 @@ TQString TDEBackend::unmount(const TQString &_udi)
TQString uid = sdevice->uniqueID();
TQString node = sdevice->deviceNode();
- TDEStorageOpResult unmountResult = sdevice->unmountDevice();
+ TQStringVariantMap unmountResult = sdevice->unmountDevice();
if (unmountResult["result"].toBool() == false) {
// Unmount failed!
qerror = "<qt>" + i18n("Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>%4</b> could not be unmounted. ").arg("system:/media/" + medium->name(), medium->deviceNode(), medium->prettyLabel(), medium->prettyBaseURL().pathOrURL());