diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-05-16 00:00:57 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-05-16 00:00:57 +0900 |
| commit | 536cfddc84c7e3ff417938d77db32db41b7202dd (patch) | |
| tree | 00a17611786c4db2b8df41c4610a2a2b1d6b6117 /tdecore/tdehw/tdestoragedevice.cpp | |
| parent | 86fea6f5c542ba7113dbc598d8b4c18be69901f2 (diff) | |
| download | tdelibs-536cfddc84c7e3ff417938d77db32db41b7202dd.tar.gz tdelibs-536cfddc84c7e3ff417938d77db32db41b7202dd.zip | |
Use new function TQT_DBusData::getAsVariantData() instead of local
version of it.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tdecore/tdehw/tdestoragedevice.cpp')
| -rw-r--r-- | tdecore/tdehw/tdestoragedevice.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp index 6c82efb2b..7dd236524 100644 --- a/tdecore/tdehw/tdestoragedevice.cpp +++ b/tdecore/tdehw/tdestoragedevice.cpp @@ -70,11 +70,6 @@ #include "tqdbusdatalist.h" #endif // ddefined(WITH_UDISKS) -#if defined(WITH_UDISKS) || defined(WITH_UDISKS2) - // Defined in tdehardwaredevices.cpp - TQT_DBusData convertDBUSDataToVariantData(TQT_DBusData); -#endif // defined(WITH_UDISKS) || defined(WITH_UDISKS2) - TDEStorageDevice::TDEStorageDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn), m_mediaInserted(true), m_cryptDevice(NULL) { m_diskType = TDEDiskDeviceType::Null; m_diskStatus = TDEDiskDeviceStatus::Null; @@ -480,9 +475,9 @@ int mountDriveUDisks2(TQString deviceNode, TQString fileSystemType, TQString mou TQValueList<TQT_DBusData> params; TQMap<TQString, TQT_DBusData> optionsMap; if (fileSystemType != "") { - optionsMap["fstype"] = convertDBUSDataToVariantData(TQT_DBusData::fromString(fileSystemType)); + optionsMap["fstype"] = (TQT_DBusData::fromString(fileSystemType)).getAsVariantData(); } - optionsMap["options"] = convertDBUSDataToVariantData(TQT_DBusData::fromString(mountOptions)); + optionsMap["options"] = (TQT_DBusData::fromString(mountOptions)).getAsVariantData(); params << TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(optionsMap)); TQT_DBusMessage reply = driveControl.sendWithReply("Mount", params, &error); if (error.isValid()) { @@ -566,7 +561,7 @@ int unMountDriveUDisks2(TQString deviceNode, TQString unMountOptions, TQString* if (driveControl.canSend()) { TQValueList<TQT_DBusData> params; TQMap<TQString, TQT_DBusData> optionsMap; - optionsMap["options"] = convertDBUSDataToVariantData(TQT_DBusData::fromString(unMountOptions)); + optionsMap["options"] = (TQT_DBusData::fromString(unMountOptions)).getAsVariantData(); params << TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(optionsMap)); TQT_DBusMessage reply = driveControl.sendWithReply("Unmount", params, &error); if (error.isValid()) { |