From 7d2c7f0621177487fcc3953921788f7cafc509af Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sat, 1 Jun 2019 13:46:23 +0900
Subject: Adjusted to use new TQStringVariantMap type.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 kcontrol/hwmanager/devicepropsdlg.cpp                | 4 ++--
 kcontrol/hwmanager/hwdevicetray.cpp                  | 4 ++--
 tdeioslave/media/mediamanager/tdehardwarebackend.cpp | 6 +++---
 3 files changed, 7 insertions(+), 7 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;
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());
-- 
cgit v1.2.1