diff options
| author | Michele Calgaro <[email protected]> | 2019-06-01 13:46:23 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2019-07-08 10:33:33 +0900 |
| commit | 7d2c7f0621177487fcc3953921788f7cafc509af (patch) | |
| tree | 391ec3fe2be390cdad396ba52e50e904b7ab75d4 /kcontrol/hwmanager | |
| parent | df9e4e43b0e3e9945d9b32c1b0683314239d1476 (diff) | |
| download | tdebase-7d2c7f0621177487fcc3953921788f7cafc509af.tar.gz tdebase-7d2c7f0621177487fcc3953921788f7cafc509af.zip | |
Adjusted to use new TQStringVariantMap type.
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'kcontrol/hwmanager')
| -rw-r--r-- | kcontrol/hwmanager/devicepropsdlg.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwdevicetray.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp index c97c6dea2..be15b4e5e 100644 --- a/kcontrol/hwmanager/devicepropsdlg.cpp +++ b/kcontrol/hwmanager/devicepropsdlg.cpp @@ -885,7 +885,7 @@ void DevicePropertiesDialog::mountDisk() { diskLabel = i18n("%1 Removable Device").arg(sdevice->deviceFriendlySize()); } TDEStorageMountOptions mountOptions; - TDEStorageOpResult mountResult = sdevice->mountDevice(diskLabel, mountOptions); + TQStringVariantMap mountResult = sdevice->mountDevice(diskLabel, mountOptions); 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"); @@ -908,7 +908,7 @@ void DevicePropertiesDialog::unmountDisk() { TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device); TQString qerror; - TDEStorageOpResult unmountResult = sdevice->unmountDevice(); + TQStringVariantMap unmountResult = sdevice->unmountDevice(); if (unmountResult["result"].toBool() == false) { // Unmount failed! qerror = "<qt>" + i18n("Unfortunately, the device could not be unmounted."); diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp index ae3a1db23..f8e6b89a9 100644 --- a/kcontrol/hwmanager/hwdevicetray.cpp +++ b/kcontrol/hwmanager/hwdevicetray.cpp @@ -301,10 +301,10 @@ void HwDeviceSystemTray::slotUnmountDevice(int parameter) TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(hwdevice); if ((sdevice->diskUUID() == uuid) || (sdevice->systemPath() == uuid)) { if (!sdevice->mountPath().isEmpty()) { - TDEStorageOpResult unmountResult = sdevice->unmountDevice(); + TQStringVariantMap unmountResult = sdevice->unmountDevice(); if (unmountResult["result"].toBool() == false) { TQString errStr = unmountResult.contains("errStr") ? unmountResult["errStr"].toString() : TQString::null; - TQString retcodeStr = unmountResult.contains("retCode") ? unmountResult["retCode"].asString() : "not available"; + TQString retcodeStr = unmountResult.contains("retCode") ? unmountResult["retCode"].toString() : "not available"; KMessageBox::error(0, i18n("<qt><b>Unable to eject device</b><p>Detailed error information:<br>%1 (error code %2)</qt>").arg(errStr).arg(retcodeStr), i18n("Eject Failed")); } return; |