Adjusted to use new TQStringVariantMap type.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/2/head
Michele Calgaro 6 years ago
parent b1246c7067
commit 82c3b55a9a
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -843,7 +843,7 @@ int K3bDevice::HalConnection::mount( K3bDevice::Device* dev,
// FIXME // FIXME
// Options from 'options' are not currently loaded into 'mountOptions' // Options from 'options' are not currently loaded into 'mountOptions'
TDEStorageMountOptions mountOptions; TDEStorageMountOptions mountOptions;
TDEStorageOpResult mountResult = sdevice->mountDevice(mountPoint, mountOptions); TQStringVariantMap mountResult = sdevice->mountDevice(mountPoint, mountOptions);
TQString mountedPath = mountResult.contains("mountPath") ? mountResult["mountPath"].toString() : TQString::null; TQString mountedPath = mountResult.contains("mountPath") ? mountResult["mountPath"].toString() : TQString::null;
if (mountedPath.isEmpty()) { if (mountedPath.isEmpty()) {
return org_freedesktop_Hal_CommunicationError; return org_freedesktop_Hal_CommunicationError;
@ -874,7 +874,7 @@ int K3bDevice::HalConnection::unmount(K3bDevice::Device* dev, const TQStringList
// Options from 'options' are not currently loaded into 'mountOptions' // Options from 'options' are not currently loaded into 'mountOptions'
TQString mountOptions; TQString mountOptions;
TDEStorageOpResult unmountResult = sdevice->unmountDevice(); TQStringVariantMap unmountResult = sdevice->unmountDevice();
if (unmountResult["result"].toBool() == false) { if (unmountResult["result"].toBool() == false) {
// Unmount failed! // Unmount failed!
return org_freedesktop_Hal_CommunicationError; return org_freedesktop_Hal_CommunicationError;

Loading…
Cancel
Save