1 files changed, 19 insertions, 19 deletions

diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index 0e6eb4ad8..d26188927 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -27,13 +27,13 @@
 #include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeio/job.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kmimetype.h>
 #include <kmountpoint.h>
 #include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kprotocolinfo.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "dialog.h"
 
@@ -55,9 +55,9 @@ TDEBackend::TDEBackend(MediaList &list, TQObject* parent)
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 
 	// Connect device monitoring signals/slots
-	connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(AddDeviceHandler(TDEGenericDevice*)));
-	connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(RemoveDeviceHandler(TDEGenericDevice*)));
-	connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(ModifyDeviceHandler(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(AddDeviceHandler(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(RemoveDeviceHandler(TDEGenericDevice*)));
+	connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(ModifyDeviceHandler(TDEGenericDevice*)));
 
 	// List devices at startup
 	ListDevices();
@@ -484,6 +484,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 	if (useDefaultLabel) {
 		diskLabel = i18n("%1 Removable Device").arg(sdevice->deviceFriendlySize());
 	}
+	diskLabel += " (" + sdevice->deviceNode() + ")";
 
 	TQString mimeType;
 
@@ -519,7 +520,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 		// Default
 		mimeType = "media/cdrom" + MOUNT_MEDIA_SUFFIX;
 		if (useDefaultLabel) {
-			diskLabel = i18n("%1 Removable Device").arg(sdevice->deviceFriendlySize());
+			diskLabel = i18n("%1 Removable Disk (%2)").arg(sdevice->deviceFriendlySize(), sdevice->deviceNode());
 		}
 
 		if (sdevice->isDiskOfType(TDEDiskDeviceType::CDROM)) {
@@ -770,12 +771,11 @@ void TDEBackend::setVolumeProperties(Medium* medium)
 			diskLabel = i18n("%1 Fixed Disk (%2)").arg(sdevice->deviceFriendlySize(), sdevice->deviceNode());
 		}
 
-		if (sdevice->isDiskOfType(TDEDiskDeviceType::USB)
-		    || sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)
-		    || sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) {
+		if (sdevice->isDiskOfType(TDEDiskDeviceType::USB) ||
+		    sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) {
 			mimeType = "media/removable" + MOUNT_MEDIA_SUFFIX;
 			if (useDefaultLabel) {
-				diskLabel = i18n("%1 Removable Device").arg(sdevice->deviceFriendlySize());
+				diskLabel = i18n("%1 Removable Disk (%2)").arg(sdevice->deviceFriendlySize(), sdevice->deviceNode());
 			}
 		}
 
@@ -882,7 +882,7 @@ bool TDEBackend::setFloppyProperties(Medium* medium)
 		// Set label
 		TQString diskLabel = sdevice->diskLabel();
 		if (diskLabel.isNull()) {
-			diskLabel = i18n("%1 Zip Disk").arg(sdevice->deviceFriendlySize());
+			diskLabel = i18n("%1 Zip Disk (%2)").arg(sdevice->deviceFriendlySize(), sdevice->deviceNode());
 		}
 		medium->setLabel(diskLabel);
 	}
@@ -909,7 +909,7 @@ void TDEBackend::setCameraProperties(Medium* medium)
 
 	TQString device = "camera:/";
 
-	TQStringList devNodeList = TQStringList::split("/", sdevice->deviceNode(), TRUE);
+	TQStringList devNodeList = TQStringList::split("/", sdevice->deviceNode(), true);
 	TQString devNode0 = devNodeList[devNodeList.count()-2];
 	TQString devNode1 = devNodeList[devNodeList.count()-1];
 
@@ -1034,7 +1034,7 @@ TQStringList TDEBackend::mountoptions(const TQString &name)
 
 	bool removable = false;
 	if (!drive_udi.isNull()) {
-		removable = ((sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)) || (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)));
+		removable = sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable);
 	}
 
 	TQString tmp;
@@ -1234,12 +1234,12 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
 		data.medium = medium;
 
 		TDEIO::Job *job = TDEIO::mount(false, 0, medium->deviceNode(), mountPoint);
-		connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
+		connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)));
 		mount_jobs[job] = &data;
 		// The caller expects the device to be mounted when the function
 		// completes. Thus block until the job completes.
 		while (!data.completed) {
-			kapp->eventLoop()->enterLoop();
+			tdeApp->eventLoop()->enterLoop();
 		}
 		if (!data.error) {
 			result["result"] = true;
@@ -1268,7 +1268,7 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
 	}
 	if (diskLabel.isEmpty()) {
 		// Try to use a pretty mount point if possible
-		TQStringList pieces = TQStringList::split("/", sdevice->deviceNode(), FALSE);
+		TQStringList pieces = TQStringList::split("/", sdevice->deviceNode(), false);
 		TQString node = pieces[pieces.count()-1];
 		diskLabel = medium->label() + " (" + node + ")";
 		diskLabel.replace("/", "_");
@@ -1345,12 +1345,12 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id)
 		data.medium = medium;
 
 		TDEIO::Job *job = TDEIO::unmount( medium->mountPoint(), false );
-		connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
+		connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)));
 		mount_jobs[job] = &data;
 		// The caller expects the device to be unmounted when the function
 		// completes. Thus block until the job completes.
 		while (!data.completed) {
-			kapp->eventLoop()->enterLoop();
+			tdeApp->eventLoop()->enterLoop();
 		}
 		if (!data.error) {
 			result["result"] = true;
@@ -1682,7 +1682,7 @@ void TDEBackend::slotResult(TDEIO::Job *job)
 	/* Job completed. Notify the caller */
 	data->error = job->error();
 	data->completed = true;
-	kapp->eventLoop()->exitLoop();
+	tdeApp->eventLoop()->exitLoop();
 }
 
 TQString TDEBackend::isInFstab(const Medium *medium)