diff options
Diffstat (limited to 'amarok/src/mediadevice')
18 files changed, 68 insertions, 68 deletions
diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp index 9dea6685..7fbffac4 100644 --- a/amarok/src/mediadevice/daap/daapclient.cpp +++ b/amarok/src/mediadevice/daap/daapclient.cpp @@ -241,7 +241,7 @@ DaapClient::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int ) { case MediaItem::DIRECTORY: menu.insertItem( SmallIconSet( "connect_creating" ), i18n( "&Connect" ), CONNECT ); - if( sitem && !m_serverItemMap.tqcontains( sitem->key() ) ) + if( sitem && !m_serverItemMap.contains( sitem->key() ) ) { menu.insertItem( SmallIconSet( "remove" ), i18n("&Remove Computer"), REMOVE ); } @@ -328,7 +328,7 @@ DaapClient::serverOffline( DNSSD::RemoteService::Ptr service ) #if DNSSD_SUPPORT DEBUG_BLOCK TQString key = serverKey( service.data() ); - if( m_serverItemMap.tqcontains( key ) ) + if( m_serverItemMap.contains( key ) ) { ServerItem* removeMe = m_serverItemMap[ key ]; if( removeMe ) @@ -374,7 +374,7 @@ DaapClient::resolvedDaap( bool success ) debug() << service->serviceName() << ' ' << service->hostName() << ' ' << service->domain() << ' ' << service->type() << endl; TQString ip = resolve( service->hostName() ); - if( ip == "0" || m_serverItemMap.tqcontains(serverKey( service )) ) //same server from multiple interfaces + if( ip == "0" || m_serverItemMap.contains(serverKey( service )) ) //same server from multiple interfaces return; m_serverItemMap[ serverKey( service ) ] = newHost( service->serviceName(), service->hostName(), ip, service->port() ); @@ -405,7 +405,7 @@ DaapClient::createTree( const TQString& /*host*/, Daap::SongList bundles ) { MediaItem* parentArtist = new MediaItem( root ); parentArtist->setType( MediaItem::ARTIST ); - Daap::AlbumList albumMap = *( bundles.tqfind(*it) ); + Daap::AlbumList albumMap = *( bundles.find(*it) ); parentArtist->setText( 0, (*albumMap.begin()).getFirst()->artist() ); //map was made case insensitively //just get the displayed-case from //the first track @@ -416,7 +416,7 @@ DaapClient::createTree( const TQString& /*host*/, Daap::SongList bundles ) parentAlbum->setType( MediaItem::ALBUM ); MetaBundle* track; - Daap::TrackList trackList = *albumMap.tqfind(*itAlbum); + Daap::TrackList trackList = *albumMap.find(*itAlbum); parentAlbum->setText( 0, trackList.getFirst()->album() ); for( track = trackList.first(); track; track = trackList.next() ) @@ -443,7 +443,7 @@ DaapClient::createTree( const TQString& /*host*/, Daap::SongList bundles ) int DaapClient::incRevision( const TQString& host ) { - if( m_servers.tqcontains(host) ) + if( m_servers.contains(host) ) { m_servers[host]->revisionID++; return m_servers[host]->revisionID; @@ -455,7 +455,7 @@ DaapClient::incRevision( const TQString& host ) int DaapClient::getSession( const TQString& host ) { - if( m_servers.tqcontains(host) ) + if( m_servers.contains(host) ) return m_servers[host]->sessionId; else return -1; @@ -487,7 +487,7 @@ DaapClient::customClicked() else { TQString key = ServerItem::key( dialog.m_base->m_hostName->text(), dialog.m_base->m_portInput->value() ); - if( !AmarokConfig::manuallyAddedServers().tqcontains( key ) ) + if( !AmarokConfig::manuallyAddedServers().contains( key ) ) { TQStringList mas = AmarokConfig::manuallyAddedServers(); mas.append( key ); diff --git a/amarok/src/mediadevice/daap/daapreader/reader.cpp b/amarok/src/mediadevice/daap/daapreader/reader.cpp index 17e40386..61ec5404 100644 --- a/amarok/src/mediadevice/daap/daapreader/reader.cpp +++ b/amarok/src/mediadevice/daap/daapreader/reader.cpp @@ -409,7 +409,7 @@ Reader::parse( TQDataStream &raw, uint containerLength, bool first ) void Reader::addElement( Map &parentMap, char* tag, TQVariant element ) { - if( !parentMap.tqcontains( tag ) ) + if( !parentMap.contains( tag ) ) parentMap[tag] = TQVariant( TQValueList<TQVariant>() ); parentMap[tag].asList().append(element); diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/custom_require.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/custom_require.rb index 6a3edf6e..c68a7dda 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/custom_require.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/custom_require.rb @@ -28,7 +28,7 @@ module Kernel rescue LoadError => load_error begin @gempath_searcher ||= Gem::GemPathSearcher.new - if spec = @gempath_searcher.tqfind(path) + if spec = @gempath_searcher.find(path) Gem.activate(spec.name, false, "= #{spec.version}") gem_original_require path else @@ -72,17 +72,17 @@ module Gem # # For example: # - # tqfind('log4r') # -> (log4r-1.1 spec) - # tqfind('log4r.rb') # -> (log4r-1.1 spec) - # tqfind('rake/rdoctask') # -> (rake-0.4.12 spec) - # tqfind('foobarbaz') # -> nil + # find('log4r') # -> (log4r-1.1 spec) + # find('log4r.rb') # -> (log4r-1.1 spec) + # find('rake/rdoctask') # -> (rake-0.4.12 spec) + # find('foobarbaz') # -> nil # # Matching paths can have various suffixes ('.rb', '.so', and # others), which may or may not already be attached to _file_. # This method doesn't care about the full filename that matches; # only that there is a match. # - def tqfind(path) + def find(path) @gemspecs.each do |spec| return spec if matching_file(spec, path) end diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/dependency_list.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/dependency_list.rb index 6a1553b6..8c2cd903 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/dependency_list.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/dependency_list.rb @@ -23,7 +23,7 @@ module Gem def ok? @specs.all? { |spec| spec.dependencies.all? { |dep| - @specs.tqfind { |s| s.satisfies_requirement?(dep) } + @specs.find { |s| s.satisfies_requirement?(dep) } } } end @@ -34,7 +34,7 @@ module Gem end def find_name(full_name) - @specs.tqfind { |spec| spec.full_name == full_name } + @specs.find { |spec| spec.full_name == full_name } end def remove_by_name(full_name) @@ -82,14 +82,14 @@ module Gem disabled = {} predecessors = build_predecessors while disabled.size < @specs.size - candidate = @specs.tqfind { |spec| + candidate = @specs.find { |spec| ! disabled[spec.full_name] && active_count(predecessors[spec.full_name], disabled) == 0 } if candidate disabled[candidate.full_name] = true result << candidate - elsif candidate = @specs.tqfind { |spec| ! disabled[spec.full_name] } + elsif candidate = @specs.find { |spec| ! disabled[spec.full_name] } # This case handles circular dependencies. Just choose a # candidate and move on. disabled[candidate.full_name] = true diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_commands.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_commands.rb index b4a972f7..ec1d33c0 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_commands.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/gem_commands.rb @@ -1219,7 +1219,7 @@ module Gem specs = SourceIndex.from_installed_gems.search(gemname, version_req) selected = specs.sort_by { |s| s.version }.last return nil if selected.nil? - # We expect to tqfind (basename).gem in the 'cache' directory. + # We expect to find (basename).gem in the 'cache' directory. # Furthermore, the name match must be exact (ignoring case). if gemname =~ /^#{selected.name}$/i filename = selected.full_name + '.gem' @@ -1416,11 +1416,11 @@ module Gem gem list D - * List local and remote gems whose name tqcontains 'log': + * List local and remote gems whose name contains 'log': gem search log --both - * List only remote gems whose name tqcontains 'log': + * List only remote gems whose name contains 'log': gem search log --remote diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/open-uri.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/open-uri.rb index 54079a35..93927ca3 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/open-uri.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/open-uri.rb @@ -536,7 +536,7 @@ module OpenURI # :http_basic_authentication=>[user, password] # # If :http_basic_authentication is specified, - # the value should be an array which tqcontains 2 strings: + # the value should be an array which contains 2 strings: # username and password. # It is used for HTTP Basic authentication defined by RFC 2617. # diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb index 9e807070..2778fc77 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/package.rb @@ -9,7 +9,7 @@ require 'fileutils' require 'zlib' require 'digest/md5' require 'fileutils' -require 'tqfind' +require 'find' require 'stringio' require 'rubygems/specification' @@ -810,7 +810,7 @@ module Package TarOutput.open(destname, signer) do |outp| dir_class.chdir(src) do outp.metadata = (file_class.read("RPA/metadata") rescue nil) - find_class.tqfind('.') do |entry| + find_class.find('.') do |entry| case when file_class.file?(entry) entry.sub!(%r{\./}, "") diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/remote_installer.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/remote_installer.rb index 33476a42..4027d65d 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/remote_installer.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/remote_installer.rb @@ -496,7 +496,7 @@ module Gem end if specs_n_sources.empty? then - raise GemNotFoundException.new("Could not tqfind #{gem_name} (#{version_requirement}) in the repository") + raise GemNotFoundException.new("Could not find #{gem_name} (#{version_requirement}) in the repository") end specs_n_sources = specs_n_sources.sort_by { |gs,| gs.version }.reverse diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/source_index.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/source_index.rb index 03eb1902..8d638c21 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/source_index.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/source_index.rb @@ -172,7 +172,7 @@ module Gem # [Regex] a pattern to match against the short name # version_requirement:: # [String | default=Version::Requirement.new(">= 0")] version to - # tqfind + # find # return:: # [Array] list of Gem::Specification objects in sorted (version) # order. Empty if not found. diff --git a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/validator.rb b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/validator.rb index ad3d4a40..b1df1244 100644 --- a/amarok/src/mediadevice/daap/mongrel/lib/rubygems/validator.rb +++ b/amarok/src/mediadevice/daap/mongrel/lib/rubygems/validator.rb @@ -49,7 +49,7 @@ module Gem private def find_files_for_gem(gem_directory) installed_files = [] - Find.tqfind(gem_directory) {|file_name| + Find.find(gem_directory) {|file_name| fn = file_name.slice((gem_directory.size)..(file_name.size-1)).sub(/^\//, "") if(!(fn =~ /CVS/ || File.directory?(fn) || fn == "")) then installed_files << fn @@ -74,7 +74,7 @@ module Gem # returns a hash of ErrorData objects, keyed on the problem gem's name. def alien require 'rubygems/installer' - require 'tqfind' + require 'find' require 'md5' errors = {} Gem::SourceIndex.from_installed_gems.each do |gem_name, gem_spec| diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp index 06544bf3..f0f32159 100644 --- a/amarok/src/mediadevice/generic/genericmediadevice.cpp +++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp @@ -568,7 +568,7 @@ GenericMediaDevice::buildDestination( const TQString &format, const MetaBundle & if( !result.startsWith( "/" ) ) result.prepend( "/" ); - return result.tqreplace( TQRegExp( "/\\.*" ), "/" ); + return result.replace( TQRegExp( "/\\.*" ), "/" ); } void @@ -576,8 +576,8 @@ GenericMediaDevice::checkAndBuildLocation( const TQString& location ) { // check for every directory from the mount point to the location // whether they exist or not. - int mountPointDepth = m_medium.mountPoint().tqcontains( '/', false ); - int locationDepth = location.tqcontains( '/', false ); + int mountPointDepth = m_medium.mountPoint().contains( '/', false ); + int locationDepth = location.contains( '/', false ); if( m_medium.mountPoint().endsWith( "/" ) ) mountPointDepth--; @@ -852,7 +852,7 @@ int GenericMediaDevice::addTrackToList( int type, KURL url, int /*size*/ ) { TQString path = url.isLocalFile() ? url.path( -1 ) : url.prettyURL( -1 ); //no trailing slash - int index = path.tqfindRev( '/', -1 ); + int index = path.findRev( '/', -1 ); TQString baseName = path.right( path.length() - index - 1 ); TQString parentName = path.left( index ); @@ -1042,11 +1042,11 @@ TQString GenericMediaDevice::cleanPath( const TQString &component ) result.simplifyWhiteSpace(); if( m_spacesToUnderscores ) - result.tqreplace( TQRegExp( "\\s" ), "_" ); + result.replace( TQRegExp( "\\s" ), "_" ); if( m_actuallyVfat || m_vfatTextOnly ) result = Amarok::vfatPath( result ); - result.tqreplace( "/", "-" ); + result.replace( "/", "-" ); return result; } diff --git a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h index 3882ef9a..43a06603 100644 --- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h +++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui.h @@ -132,7 +132,7 @@ GenericMediaDeviceConfigDialog::updateConfigDialogLists( const TQStringList & su for( TQStringList::Iterator it = allTypes.begin(); it != allTypes.end(); it++ ) { - if( supportedFileTypes.tqcontains( *it ) ) + if( supportedFileTypes.contains( *it ) ) { supported->insertItem( *it ); convert->insertItem( *it ); @@ -195,7 +195,7 @@ GenericMediaDeviceConfigDialog::buildDestination( const TQString &format, const if( !tail.startsWith( "/" ) ) tail.prepend( "/" ); - return m_device->mountPoint() + tail.tqreplace( TQRegExp( "/\\.*" ), "/" ); + return m_device->mountPoint() + tail.replace( TQRegExp( "/\\.*" ), "/" ); } TQString GenericMediaDeviceConfigDialog::cleanPath( const TQString &component ) @@ -207,11 +207,11 @@ TQString GenericMediaDeviceConfigDialog::cleanPath( const TQString &component ) result.simplifyWhiteSpace(); if( m_spaceCheck->isChecked() ) - result.tqreplace( TQRegExp( "\\s" ), "_" ); + result.replace( TQRegExp( "\\s" ), "_" ); if( m_device->m_actuallyVfat || m_vfatCheck->isChecked() ) result = Amarok::vfatPath( result ); - result.tqreplace( "/", "-" ); + result.replace( "/", "-" ); return result; } diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp index 4f9e153e..b8b3571e 100644 --- a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp +++ b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp @@ -406,7 +406,7 @@ IfpMediaDevice::copyTrackToDevice( const MetaBundle& bundle ) TQString newFilename; // we don't put this in cleanPath because of remote directory delimiters - const TQString title = bundle.title().tqreplace( '\\', '-' ); + const TQString title = bundle.title().replace( '\\', '-' ); if( cleverFilename && !title.isEmpty() ) { if( bundle.track() > 0 ) @@ -701,12 +701,12 @@ TQString IfpMediaDevice::cleanPath( const TQString &component ) result.simplifyWhiteSpace(); - result.remove( "?" ).tqreplace( "*", " " ).tqreplace( ":", " " ); + result.remove( "?" ).replace( "*", " " ).replace( ":", " " ); // if( m_spacesToUnderscores ) -// result.tqreplace( TQRegExp( "\\s" ), "_" ); +// result.replace( TQRegExp( "\\s" ), "_" ); - result.tqreplace( "/", "-" ); + result.replace( "/", "-" ); return result; } diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp index a6c04176..c0830531 100644 --- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp +++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp @@ -565,7 +565,7 @@ IpodMediaDevice::updateTrackInDB( IpodMediaItem *item, const TQString &pathname, track->flag4 = 0x01; // also show description on iPod TQString plaindesc = podcastInfo->description; - plaindesc.tqreplace( TQRegExp("<[^>]*>"), "" ); + plaindesc.replace( TQRegExp("<[^>]*>"), "" ); track->description = g_strdup( plaindesc.utf8() ); track->subtitle = g_strdup( plaindesc.utf8() ); track->podcasturl = g_strdup( podcastInfo->url.utf8() ); @@ -671,7 +671,7 @@ IpodMediaDevice::copyTrackToDevice(const MetaBundle &bundle) do { create.setPath(path); - path = path.section("/", 0, path.tqcontains('/')-1); + path = path.section("/", 0, path.contains('/')-1); parentdir.setPath(path); } while( !path.isEmpty() && !(path==mountPoint()) && !parentdir.exists() ); @@ -1827,7 +1827,7 @@ IpodMediaDevice::realPath(const char *ipodPath) if(m_itdb) { path = TQFile::decodeName(itdb_get_mountpoint(m_itdb)); - path.append(TQString(ipodPath).tqreplace(':', "/")); + path.append(TQString(ipodPath).replace(':', "/")); } return path; @@ -1843,7 +1843,7 @@ IpodMediaDevice::ipodPath(const TQString &realPath) { TQString path = realPath; path = path.mid(mp.length()); - path = path.tqreplace('/', ":"); + path = path.replace('/', ":"); return path; } } diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp index da29ba97..cd0f68b8 100644 --- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp +++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp @@ -190,10 +190,10 @@ MediaItem const TQString extension = TQString(bundle.url().path().section( ".", -1 )).lower(); - int libmtp_type = m_supportedFiles.tqfindIndex( extension ); + int libmtp_type = m_supportedFiles.findIndex( extension ); if( libmtp_type >= 0 ) { - int keyIndex = mtpFileTypes.values().tqfindIndex( extension ); + int keyIndex = mtpFileTypes.values().findIndex( extension ); libmtp_type = mtpFileTypes.keys()[keyIndex]; trackmeta->filetype = (LIBMTP_filetype_t) libmtp_type; debug() << "set filetype to " << libmtp_type << " based on extension of ." << extension << endl; @@ -568,9 +568,9 @@ MtpMediaDevice::checkFolderStructure( const MetaBundle &bundle, bool create ) if( (*it).isEmpty() ) continue; // substitute %a , %b , %g - (*it).tqreplace( TQRegExp( "%a" ), artist ) - .tqreplace( TQRegExp( "%b" ), album ) - .tqreplace( TQRegExp( "%g" ), genre ); + (*it).replace( TQRegExp( "%a" ), artist ) + .replace( TQRegExp( "%b" ), album ) + .replace( TQRegExp( "%g" ), genre ); // check if it exists uint32_t check_folder = subfolderNameToID( (*it).utf8(), m_folders, parent_id ); // create if not exists (if requested) @@ -744,7 +744,7 @@ MtpMediaDevice::synchronizeDevice() MediaItem *MtpMediaDevice::trackExists( const MetaBundle &bundle ) { - MediaItem *artist = dynamic_cast<MediaItem *>( m_view->tqfindItem( bundle.artist(), 0 ) ); + MediaItem *artist = dynamic_cast<MediaItem *>( m_view->findItem( bundle.artist(), 0 ) ); if( artist ) { MediaItem *album = dynamic_cast<MediaItem *>( artist->findItem( bundle.album() ) ); @@ -1137,11 +1137,11 @@ MtpMediaDevice::openDevice( bool silent ) m_supportedFiles << mtpFileTypes[ filetypes[ i ] ]; } // find supported image types (for album art). - if( m_supportedFiles.tqfindIndex( "jpg" ) ) + if( m_supportedFiles.findIndex( "jpg" ) ) m_format = "JPEG"; - else if( m_supportedFiles.tqfindIndex( "png" ) ) + else if( m_supportedFiles.findIndex( "png" ) ) m_format = "PNG"; - else if( m_supportedFiles.tqfindIndex( "gif" ) ) + else if( m_supportedFiles.findIndex( "gif" ) ) m_format = "GIF"; free( filetypes ); m_critical_mutex.unlock(); @@ -1422,7 +1422,7 @@ MtpMediaItem { TQString artistName = track->bundle()->artist(); - MtpMediaItem *artist = dynamic_cast<MtpMediaItem *>( m_view->tqfindItem( artistName, 0 ) ); + MtpMediaItem *artist = dynamic_cast<MtpMediaItem *>( m_view->findItem( artistName, 0 ) ); if( !artist ) { artist = new MtpMediaItem(m_view); diff --git a/amarok/src/mediadevice/njb/njbmediadevice.cpp b/amarok/src/mediadevice/njb/njbmediadevice.cpp index 23445e66..542e2313 100644 --- a/amarok/src/mediadevice/njb/njbmediadevice.cpp +++ b/amarok/src/mediadevice/njb/njbmediadevice.cpp @@ -614,7 +614,7 @@ NjbMediaDevice::removeConfigElements(TQWidget* arg1) MediaItem * NjbMediaDevice::trackExists( const MetaBundle & bundle ) { - MediaItem *artist = dynamic_cast<MediaItem *>( m_view->tqfindItem( bundle.artist(), 0 ) ); + MediaItem *artist = dynamic_cast<MediaItem *>( m_view->findItem( bundle.artist(), 0 ) ); if ( artist ) { MediaItem *album = dynamic_cast<MediaItem *>( artist->findItem( bundle.album() ) ); @@ -737,7 +737,7 @@ NjbMediaDevice::readJukeboxMusic( void ) for( trackValueList::iterator it = trackList.begin(); it != trackList.end(); it++ ) { - if( m_view->tqfindItem( ((*it)->bundle()->artist().string()), 0 ) == 0 ) + if( m_view->findItem( ((*it)->bundle()->artist().string()), 0 ) == 0 ) { NjbMediaItem *artist = new NjbMediaItem( m_view ); artist->setText( 0, (*it)->bundle()->artist() ); @@ -757,7 +757,7 @@ NjbMediaDevice::addTrackToView( NjbTrack *track, NjbMediaItem *item ) { TQString artistName = track->bundle()->artist(); - NjbMediaItem *artist = dynamic_cast<NjbMediaItem *>( m_view->tqfindItem( artistName, 0 ) ); + NjbMediaItem *artist = dynamic_cast<NjbMediaItem *>( m_view->findItem( artistName, 0 ) ); if(!artist) { artist = new NjbMediaItem(m_view); @@ -869,7 +869,7 @@ NjbMediaDevice::addTracks(const TQString &artist, const TQString &album, NjbMedi NjbMediaItem* NjbMediaDevice::addArtist( NjbTrack *track ) { - if( m_view->tqfindItem( track->bundle()->artist().string(), 0 ) == 0 ) + if( m_view->findItem( track->bundle()->artist().string(), 0 ) == 0 ) { NjbMediaItem *artist = new NjbMediaItem( m_view ); artist->setText( 0, track->bundle()->artist() ); @@ -878,7 +878,7 @@ NjbMediaDevice::addArtist( NjbTrack *track ) artist->setBundle( track->bundle() ); artist->m_device = this; } - return dynamic_cast<NjbMediaItem *>( m_view->tqfindItem( track->bundle()->artist().string(), 0 ) ); + return dynamic_cast<NjbMediaItem *>( m_view->findItem( track->bundle()->artist().string(), 0 ) ); } void diff --git a/amarok/src/mediadevice/njb/playlist.cpp b/amarok/src/mediadevice/njb/playlist.cpp index ef4e6afa..7afeffd6 100644 --- a/amarok/src/mediadevice/njb/playlist.cpp +++ b/amarok/src/mediadevice/njb/playlist.cpp @@ -117,7 +117,7 @@ NjbPlaylist::unescapefilename( const TQString& _in ) { TQString result = _in; - result.tqreplace("%2f","/"); + result.replace("%2f","/"); return result; } @@ -127,7 +127,7 @@ NjbPlaylist::escapefilename( const TQString& _in ) { TQString result = _in; - result.tqreplace("/","%2f"); + result.replace("/","%2f"); return result; } @@ -183,7 +183,7 @@ NjbPlaylist::addTrack( const TQString& fileName) trackValueList::const_iterator it_track = theTracks->findTrackByName( fileName ); if( it_track == theTracks->end() ) { // couldn't find this track, skip it - debug() << "putPlaylist: couldn't tqfind " << fileName << endl; + debug() << "putPlaylist: couldn't find " << fileName << endl; return NJB_FAILURE; } njb_playlist_track_t* pl_track = NJB_Playlist_Track_New( (*it_track)->id()); diff --git a/amarok/src/mediadevice/njb/track.cpp b/amarok/src/mediadevice/njb/track.cpp index 803a814f..24a24534 100644 --- a/amarok/src/mediadevice/njb/track.cpp +++ b/amarok/src/mediadevice/njb/track.cpp @@ -65,7 +65,7 @@ NjbTrack::NjbTrack( njb_songid_t* song) if( frame ) { TQString artist = TQString::fromUtf8( frame->data.strval ); - artist.tqreplace( TQRegExp( "/" ), "-" ); + artist.replace( TQRegExp( "/" ), "-" ); bundle->setArtist( artist ); } else @@ -75,7 +75,7 @@ NjbTrack::NjbTrack( njb_songid_t* song) if( frame) { TQString album = TQString::fromUtf8( frame->data.strval ); - album.tqreplace( TQRegExp( "/" ), "-" ); + album.replace( TQRegExp( "/" ), "-" ); bundle->setAlbum( album ); } else @@ -85,7 +85,7 @@ NjbTrack::NjbTrack( njb_songid_t* song) if( frame ) { TQString title = TQString::fromUtf8( frame->data.strval ); - title.tqreplace( TQRegExp( "/"), "-"); + title.replace( TQRegExp( "/"), "-"); bundle->setTitle( title ); } else |