diff options
| author | Michele Calgaro <[email protected]> | 2019-06-01 18:44:56 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2019-07-07 23:44:40 +0900 |
| commit | aaaf378033f889408155a902349c676429b85254 (patch) | |
| tree | 2adaae48af3e2f3a5f7be528880efcf06c9f1202 /tdecore/tdehw/disksHelper.cpp | |
| parent | bf683427937ea0cfd90749b833456377de6ffa10 (diff) | |
| download | tdelibs-aaaf378033f889408155a902349c676429b85254.tar.gz tdelibs-aaaf378033f889408155a902349c676429b85254.zip | |
Adjusted to use new TQStringVariantMap type.
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'tdecore/tdehw/disksHelper.cpp')
| -rw-r--r-- | tdecore/tdehw/disksHelper.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/tdecore/tdehw/disksHelper.cpp b/tdecore/tdehw/disksHelper.cpp index 37efa25ac..0eab2d28c 100644 --- a/tdecore/tdehw/disksHelper.cpp +++ b/tdecore/tdehw/disksHelper.cpp @@ -20,7 +20,6 @@ #include "disksHelper.h" #include "tdelocale.h" #include "tdestoragedevice.h" -#include <tqvariant.h> #include <tqdbusdata.h> #include <tqdbusmessage.h> #include <tqdbusproxy.h> @@ -34,8 +33,8 @@ //------------------------------- // UDisks //------------------------------- -TDEStorageOpResult UDisksEjectDrive(TDEStorageDevice *sdevice) { - TDEStorageOpResult result; +TQStringVariantMap UDisksEjectDrive(TDEStorageDevice *sdevice) { + TQStringVariantMap result; result["result"] = false; TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); @@ -67,8 +66,8 @@ TDEStorageOpResult UDisksEjectDrive(TDEStorageDevice *sdevice) { return result; } -TDEStorageOpResult UDisksMountDrive(TQString deviceNode, TQString fileSystemType, TQStringList mountOptions) { - TDEStorageOpResult result; +TQStringVariantMap UDisksMountDrive(TQString deviceNode, TQString fileSystemType, TQStringList mountOptions) { + TQStringVariantMap result; result["result"] = false; result["retcode"] = -2; @@ -109,8 +108,8 @@ TDEStorageOpResult UDisksMountDrive(TQString deviceNode, TQString fileSystemType return result; } -TDEStorageOpResult UDisksUnmountDrive(TQString deviceNode, TQStringList unmountOptions) { - TDEStorageOpResult result; +TQStringVariantMap UDisksUnmountDrive(TQString deviceNode, TQStringList unmountOptions) { + TQStringVariantMap result; result["result"] = false; result["retcode"] = -2; @@ -153,8 +152,8 @@ TDEStorageOpResult UDisksUnmountDrive(TQString deviceNode, TQStringList unmountO //------------------------------- // UDisks2 //------------------------------- -TDEStorageOpResult UDisks2EjectDrive(TDEStorageDevice *sdevice) { - TDEStorageOpResult result; +TQStringVariantMap UDisks2EjectDrive(TDEStorageDevice *sdevice) { + TQStringVariantMap result; result["result"] = false; TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); @@ -223,8 +222,8 @@ TDEStorageOpResult UDisks2EjectDrive(TDEStorageDevice *sdevice) { return result; } -TDEStorageOpResult UDisks2MountDrive(TQString deviceNode, TQString fileSystemType, TQString mountOptions) { - TDEStorageOpResult result; +TQStringVariantMap UDisks2MountDrive(TQString deviceNode, TQString fileSystemType, TQString mountOptions) { + TQStringVariantMap result; result["result"] = false; result["retcode"] = -2; @@ -269,8 +268,8 @@ TDEStorageOpResult UDisks2MountDrive(TQString deviceNode, TQString fileSystemTyp return result; } -TDEStorageOpResult UDisks2UnmountDrive(TQString deviceNode, TQString unmountOptions) { - TDEStorageOpResult result; +TQStringVariantMap UDisks2UnmountDrive(TQString deviceNode, TQString unmountOptions) { + TQStringVariantMap result; result["result"] = false; result["retcode"] = -2; |