Fixed displaying of encrypted disks.

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 47 insertions, 59 deletions

diff --git a/tdecore/tdehw/tdestoragedevice.h b/tdecore/tdehw/tdestoragedevice.h
index 79223d185..88991315e 100644
--- a/tdecore/tdehw/tdestoragedevice.h
+++ b/tdecore/tdehw/tdestoragedevice.h
@@ -32,53 +32,53 @@ enum TDEDiskDeviceType : unsigned long long {
 #else
 enum TDEDiskDeviceType {
 #endif
-	Null =		0x0000000000000000ULL,
-	MediaDevice =	0x0000000000000001ULL,
-	Floppy =	0x0000000000000002ULL,
-	CDROM =		0x0000000000000004ULL,
-	CDR =		0x0000000000000008ULL,
-	CDRW =		0x0000000000000010ULL,
-	CDMO =		0x0000000000000020ULL,
-	CDMRRW =	0x0000000000000040ULL,
-	CDMRRWW =	0x0000000000000080ULL,
-	DVDROM =	0x0000000000000100ULL,
-	DVDRAM =	0x0000000000000200ULL,
-	DVDR =		0x0000000000000400ULL,
-	DVDRW =		0x0000000000000800ULL,
-	DVDRDL =	0x0000000000001000ULL,
-	DVDRWDL =	0x0000000000002000ULL,
-	DVDPLUSR =	0x0000000000004000ULL,
-	DVDPLUSRW =	0x0000000000008000ULL,
-	DVDPLUSRDL =	0x0000000000010000ULL,
-	DVDPLUSRWDL =	0x0000000000020000ULL,
-	BDROM =		0x0000000000040000ULL,
-	BDR =		0x0000000000080000ULL,
-	BDRW =		0x0000000000100000ULL,
-	HDDVDROM =	0x0000000000200000ULL,
-	HDDVDR =	0x0000000000400000ULL,
-	HDDVDRW =	0x0000000000800000ULL,
-	Zip =		0x0000000001000000ULL,
-	Jaz =		0x0000000002000000ULL,
-	Camera =	0x0000000004000000ULL,
-	LUKS =		0x0000000008000000ULL,
-	OtherCrypted =	0x0000000010000000ULL,
-	CDAudio =	0x0000000020000000ULL,
-	CDVideo =	0x0000000040000000ULL,
-	DVDVideo =	0x0000000080000000ULL,
-	BDVideo =	0x0000000100000000ULL,
-	Flash =		0x0000000200000000ULL,
-	USB =		0x0000000400000000ULL,
-	Tape =		0x0000000800000000ULL,
-	HDD =		0x0000001000000000ULL,
-	Optical =	0x0000002000000000ULL,
-	RAM =		0x0000004000000000ULL,
-	Loop =		0x0000008000000000ULL,
-	CompactFlash =	0x0000010000000000ULL,
-	MemoryStick =	0x0000020000000000ULL,
-	SmartMedia =	0x0000040000000000ULL,
-	SDMMC =		0x0000080000000000ULL,
-	UnlockedCrypt =	0x0000100000000000ULL,
-	Other =		0x8000000000000000ULL
+	Null          = 0x0000000000000000ULL,
+	MediaDevice   = 0x0000000000000001ULL,
+	Floppy        = 0x0000000000000002ULL,
+	CDROM         = 0x0000000000000004ULL,
+	CDR           = 0x0000000000000008ULL,
+	CDRW          = 0x0000000000000010ULL,
+	CDMO          = 0x0000000000000020ULL,
+	CDMRRW        = 0x0000000000000040ULL,
+	CDMRRWW       = 0x0000000000000080ULL,
+	DVDROM        = 0x0000000000000100ULL,
+	DVDRAM        = 0x0000000000000200ULL,
+	DVDR          = 0x0000000000000400ULL,
+	DVDRW         = 0x0000000000000800ULL,
+	DVDRDL        = 0x0000000000001000ULL,
+	DVDRWDL       = 0x0000000000002000ULL,
+	DVDPLUSR      = 0x0000000000004000ULL,
+	DVDPLUSRW     = 0x0000000000008000ULL,
+	DVDPLUSRDL    = 0x0000000000010000ULL,
+	DVDPLUSRWDL   = 0x0000000000020000ULL,
+	BDROM         = 0x0000000000040000ULL,
+	BDR           = 0x0000000000080000ULL,
+	BDRW          = 0x0000000000100000ULL,
+	HDDVDROM      = 0x0000000000200000ULL,
+	HDDVDR        = 0x0000000000400000ULL,
+	HDDVDRW       = 0x0000000000800000ULL,
+	Zip           = 0x0000000001000000ULL,
+	Jaz           = 0x0000000002000000ULL,
+	Camera        = 0x0000000004000000ULL,
+	LUKS          = 0x0000000008000000ULL,
+	OtherCrypted  = 0x0000000010000000ULL,
+	CDAudio       = 0x0000000020000000ULL,
+	CDVideo       = 0x0000000040000000ULL,
+	DVDVideo      = 0x0000000080000000ULL,
+	BDVideo       = 0x0000000100000000ULL,
+	Flash         = 0x0000000200000000ULL,
+	USB           = 0x0000000400000000ULL,
+	Tape          = 0x0000000800000000ULL,
+	HDD           = 0x0000001000000000ULL,
+	Optical       = 0x0000002000000000ULL,
+	RAM           = 0x0000004000000000ULL,
+	Loop          = 0x0000008000000000ULL,
+	CompactFlash  = 0x0000010000000000ULL,
+	MemoryStick   = 0x0000020000000000ULL,
+	SmartMedia    = 0x0000040000000000ULL,
+	SDMMC         = 0x0000080000000000ULL,
+	UnlockedCrypt = 0x0000100000000000ULL,
+	Other         = 0x8000000000000000ULL
 };
 
 inline TDEDiskDeviceType operator|(TDEDiskDeviceType a, TDEDiskDeviceType b)
@@ -240,18 +240,6 @@ class TDECORE_EXPORT TDEStorageDevice : public TDEGenericDevice
 		    TDEStorageMountOptions mountOptions = TDEStorageMountOptions());
 
 		/**
-		 * Mounts the encrypted device if the correct passphrase is given
-		 *
-		 * @param a TQString containing the passphrase
-		 * @param a TQString containing a requested mount name under /media, if desired
-		 * @param a TDEStorageMountOptions containing any mount options for pmount, if desired
-		 *
-		 * @return a TQStringVariantMap object containing information about the operation outcome
-		 */
-		TQStringVariantMap mountEncryptedDevice(TQString passphrase, TQString mediaName = TQString::null,
-				TDEStorageMountOptions mountOptions = TDEStorageMountOptions());
-
-		/**
 		 * Unmounts the device
 		 *
 		 * @return a TQStringVariantMap object containing information about the operation outcome