diff options
Diffstat (limited to 'amarok/src/mediadevicemanager.cpp')
| -rw-r--r-- | amarok/src/mediadevicemanager.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/amarok/src/mediadevicemanager.cpp b/amarok/src/mediadevicemanager.cpp index 48bfbb06..eacb12b7 100644 --- a/amarok/src/mediadevicemanager.cpp +++ b/amarok/src/mediadevicemanager.cpp @@ -62,23 +62,23 @@ MediaDeviceManager::MediaDeviceManager() { curr = qit.key(); curr = curr.remove( "manual|" ); - currName = curr.left( curr.find( '|' ) ); + currName = curr.left( curr.tqfind( '|' ) ); currMountPoint = curr.remove( currName + '|' ); manualDevices.append( "false" ); //autodetected manualDevices.append( qit.key() ); //id manualDevices.append( currName ); //name manualDevices.append( currName ); //label - manualDevices.append( TQString::null ); //userLabel + manualDevices.append( TQString() ); //userLabel manualDevices.append( "unknown" ); //mountable? - manualDevices.append( TQString::null ); //device node + manualDevices.append( TQString() ); //device node manualDevices.append( currMountPoint ); //mountPoint manualDevices.append( "manual" ); //fsType manualDevices.append( "unknown" ); //mounted - manualDevices.append( TQString::null ); //baseURL - manualDevices.append( TQString::null ); //MIMEtype - manualDevices.append( TQString::null ); //iconName + manualDevices.append( TQString() ); //baseURL + manualDevices.append( TQString() ); //MIMEtype + manualDevices.append( TQString() ); //iconName manualDevices.append( "false" ); //encrypted - manualDevices.append( TQString::null ); //clearDeviceUdi + manualDevices.append( TQString() ); //clearDeviceUdi manualDevices.append( "---" ); //separator } } @@ -105,7 +105,7 @@ void MediaDeviceManager::removeManualDevice( Medium* removed ) { emit mediumRemoved( removed, removed->name() ); - if( m_mediumMap.contains( removed->name() ) ) + if( m_mediumMap.tqcontains( removed->name() ) ) m_mediumMap.remove( removed->name() ); } @@ -119,7 +119,7 @@ void MediaDeviceManager::slotMediumAdded( const Medium *m, TQString id) (m->fsType() == "vfat" || m->fsType() == "hfsplus" || m->fsType() == "msdosfs" ) ) ) // add other fsTypes that should be auto-detected here later { - if ( m_mediumMap.contains( m->name() ) ) + if ( m_mediumMap.tqcontains( m->name() ) ) { Medium *tempMedium = m_mediumMap[m->name()]; m_mediumMap.remove( m->name() ); @@ -141,7 +141,7 @@ void MediaDeviceManager::slotMediumRemoved( const Medium* , TQString id ) { DEBUG_BLOCK Medium* removedMedium = 0; - if ( m_mediumMap.contains(id) ) + if ( m_mediumMap.tqcontains(id) ) removedMedium = m_mediumMap[id]; if ( removedMedium ) debug() << "[MediaDeviceManager::slotMediumRemoved] Obtained medium name is " << id << ", id is: " << removedMedium->id() << endl; @@ -152,7 +152,7 @@ void MediaDeviceManager::slotMediumRemoved( const Medium* , TQString id ) //has been running //There is no point in calling getDevice, since it will not be in the list anyways emit mediumRemoved( removedMedium, id ); - if ( m_mediumMap.contains(id) ) + if ( m_mediumMap.tqcontains(id) ) m_mediumMap.remove(id); delete removedMedium; } |