diff options
Diffstat (limited to 'amarok/src/device/massstorage/massstoragedevicehandler.cpp')
| -rw-r--r-- | amarok/src/device/massstorage/massstoragedevicehandler.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/amarok/src/device/massstorage/massstoragedevicehandler.cpp b/amarok/src/device/massstorage/massstoragedevicehandler.cpp index 76ff777b..57b0c3d4 100644 --- a/amarok/src/device/massstorage/massstoragedevicehandler.cpp +++ b/amarok/src/device/massstorage/massstoragedevicehandler.cpp @@ -27,7 +27,7 @@ AMAROK_EXPORT_PLUGIN( MassStorageDeviceHandlerFactory ) #include <kconfig.h> #include <kurl.h> -#include <qvaluelist.h> +#include <tqvaluelist.h> MassStorageDeviceHandler::MassStorageDeviceHandler() : DeviceHandler() @@ -35,7 +35,7 @@ MassStorageDeviceHandler::MassStorageDeviceHandler() { } -MassStorageDeviceHandler::MassStorageDeviceHandler( int deviceId, const QString &mountPoint, const QString &uuid ) +MassStorageDeviceHandler::MassStorageDeviceHandler( int deviceId, const TQString &mountPoint, const TQString &uuid ) : DeviceHandler() , m_deviceID( deviceId ) , m_mountPoint( mountPoint ) @@ -53,7 +53,7 @@ bool MassStorageDeviceHandler::isAvailable() const } -QString MassStorageDeviceHandler::type() const +TQString MassStorageDeviceHandler::type() const { return "uuid"; } @@ -63,7 +63,7 @@ int MassStorageDeviceHandler::getDeviceID() return m_deviceID; } -const QString &MassStorageDeviceHandler::getDevicePath() const +const TQString &MassStorageDeviceHandler::getDevicePath() const { return m_mountPoint; } @@ -89,7 +89,7 @@ bool MassStorageDeviceHandler::deviceIsMedium( const Medium * m ) const // class MassStorageDeviceHandlerFactory /////////////////////////////////////////////////////////////////////////////// -QString MassStorageDeviceHandlerFactory::type( ) const +TQString MassStorageDeviceHandlerFactory::type( ) const { return "uuid"; } @@ -124,19 +124,19 @@ DeviceHandler * MassStorageDeviceHandlerFactory::createHandler( const KConfig* ) DeviceHandler * MassStorageDeviceHandlerFactory::createHandler( const Medium * m ) const { - QStringList ids = CollectionDB::instance()->query( QString( "SELECT id, label, lastmountpoint " + TQStringList ids = CollectionDB::instance()->query( TQString( "SELECT id, label, lastmountpoint " "FROM devices WHERE type = 'uuid' " "AND uuid = '%1';" ).arg( m->id() ) ); if ( ids.size() == 3 ) { debug() << "Found existing UUID config for ID " << ids[0] << " , uuid " << m->id() << endl; - CollectionDB::instance()->query( QString( "UPDATE devices SET lastmountpoint = '%2' WHERE " + CollectionDB::instance()->query( TQString( "UPDATE devices SET lastmountpoint = '%2' WHERE " "id = %1;" ).arg( ids[0] ).arg( m->mountPoint() ) ); return new MassStorageDeviceHandler( ids[0].toInt(), m->mountPoint(), m->id() ); } else { - int id = CollectionDB::instance()->insert( QString( "INSERT INTO devices( type, uuid, lastmountpoint ) " + int id = CollectionDB::instance()->insert( TQString( "INSERT INTO devices( type, uuid, lastmountpoint ) " "VALUES ( 'uuid', '%1', '%2' );" ) .arg( m->id() ) .arg( m->mountPoint() ), "devices" ); @@ -151,7 +151,7 @@ DeviceHandler * MassStorageDeviceHandlerFactory::createHandler( const Medium * m } bool -MassStorageDeviceHandlerFactory::excludedFilesystem( const QString &fstype ) const +MassStorageDeviceHandlerFactory::excludedFilesystem( const TQString &fstype ) const { return fstype.isEmpty() || fstype.find( "smb" ) != -1 || |