diff options
Diffstat (limited to 'amarok/src/playlistbrowseritem.cpp')
-rw-r--r-- | amarok/src/playlistbrowseritem.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp index 5ab0ed69..82b1bb22 100644 --- a/amarok/src/playlistbrowseritem.cpp +++ b/amarok/src/playlistbrowseritem.cpp @@ -1737,7 +1737,7 @@ PodcastChannel::setSettings( PodcastSettings *newSettings ) { //create the local directory first PodcastEpisode::createLocalDir( newSettings->saveLocation() ); - KIO::CopyJob* m_podcastMoveJob = KIO::move( copyList, KURL::fromPathOrURL( newSettings->saveLocation() ), false ); + TDEIO::CopyJob* m_podcastMoveJob = TDEIO::move( copyList, KURL::fromPathOrURL( newSettings->saveLocation() ), false ); Amarok::StatusBar::instance()->newProgressOperation( m_podcastMoveJob ) .setDescription( i18n( "Moving Podcasts" ) ); } @@ -1798,13 +1798,13 @@ PodcastChannel::fetch() startAnimation(); connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) ); - m_podcastJob = KIO::storedGet( m_url, false, false ); + m_podcastJob = TDEIO::storedGet( m_url, false, false ); Amarok::StatusBar::instance()->newProgressOperation( m_podcastJob ) .setDescription( i18n( "Fetching Podcast" ) ) .setAbortSlot( this, TQT_SLOT( abortFetch() ) ); - connect( m_podcastJob, TQT_SIGNAL( result( KIO::Job* ) ), TQT_SLOT( fetchResult( KIO::Job* ) ) ); + connect( m_podcastJob, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( fetchResult( TDEIO::Job* ) ) ); } void @@ -1819,7 +1819,7 @@ PodcastChannel::abortFetch() } void -PodcastChannel::fetchResult( KIO::Job* job ) //SLOT +PodcastChannel::fetchResult( TDEIO::Job* job ) //SLOT { stopAnimation(); if ( job->error() != 0 ) @@ -1835,7 +1835,7 @@ PodcastChannel::fetchResult( KIO::Job* job ) //SLOT return; } - KIO::StoredTransferJob* const storedJob = static_cast<KIO::StoredTransferJob*>( job ); + TDEIO::StoredTransferJob* const storedJob = static_cast<TDEIO::StoredTransferJob*>( job ); TQDomDocument d; @@ -2213,7 +2213,7 @@ PodcastChannel::purge() } if( !urlsToDelete.isEmpty() ) - KIO::del( urlsToDelete ); + TDEIO::del( urlsToDelete ); } void @@ -2560,21 +2560,21 @@ PodcastEpisode::downloadMedia() //filename might get changed by redirects later. m_filename = url().fileName(); m_localUrl = localDir; - m_podcastEpisodeJob = KIO::storedGet( url().url(), false, false); + m_podcastEpisodeJob = TDEIO::storedGet( url().url(), false, false); Amarok::StatusBar::instance()->newProgressOperation( m_podcastEpisodeJob ) .setDescription( title().isEmpty() ? i18n( "Downloading Podcast Media" ) : i18n( "Downloading Podcast \"%1\"" ).arg( title() ) ) .setAbortSlot( this, TQT_SLOT( abortDownload()) ) - .setProgressSignal( m_podcastEpisodeJob, TQT_SIGNAL( percent( KIO::Job *, unsigned long ) ) ); + .setProgressSignal( m_podcastEpisodeJob, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ) ); - connect( m_podcastEpisodeJob, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( downloadResult( KIO::Job * ) ) ); - connect( m_podcastEpisodeJob, TQT_SIGNAL( redirection( KIO::Job *,const KURL& ) ), TQT_SLOT( redirected( KIO::Job *,const KURL& ) ) ); + connect( m_podcastEpisodeJob, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( downloadResult( TDEIO::Job * ) ) ); + connect( m_podcastEpisodeJob, TQT_SIGNAL( redirection( TDEIO::Job *,const KURL& ) ), TQT_SLOT( redirected( TDEIO::Job *,const KURL& ) ) ); } /* change the localurl if redirected, allows us to use the original filename to transfer to mediadevices*/ -void PodcastEpisode::redirected( KIO::Job *, const KURL & redirectedUrl ) +void PodcastEpisode::redirected( TDEIO::Job *, const KURL & redirectedUrl ) { debug() << "redirecting to " << redirectedUrl << ". filename: " << redirectedUrl.fileName() << endl; m_filename = redirectedUrl.fileName(); @@ -2608,7 +2608,7 @@ PodcastEpisode::abortDownload() //SLOT updatePixmap(); } -void PodcastEpisode::downloadResult( KIO::Job * transferJob ) +void PodcastEpisode::downloadResult( TDEIO::Job * transferJob ) { emit downloadFinished(); stopAnimation(); @@ -3493,10 +3493,10 @@ void ShoutcastBrowser::setOpen( bool open ) if ( !m_downloading ) { m_downloading = true; - m_cj = KIO::copy( "http://www.shoutcast.com/sbin/newxml.phtml", tmpfile, false ); - connect( m_cj, TQT_SIGNAL( copyingDone( KIO::Job*, const KURL&, const KURL&, bool, bool)) - , this, TQT_SLOT(doneGenreDownload(KIO::Job*, const KURL&, const KURL&, bool, bool ))); - connect( m_cj, TQT_SIGNAL( result( KIO::Job* )), this, TQT_SLOT( jobFinished( KIO::Job* ))); + m_cj = TDEIO::copy( "http://www.shoutcast.com/sbin/newxml.phtml", tmpfile, false ); + connect( m_cj, TQT_SIGNAL( copyingDone( TDEIO::Job*, const KURL&, const KURL&, bool, bool)) + , this, TQT_SLOT(doneGenreDownload(TDEIO::Job*, const KURL&, const KURL&, bool, bool ))); + connect( m_cj, TQT_SIGNAL( result( TDEIO::Job* )), this, TQT_SLOT( jobFinished( TDEIO::Job* ))); } TQListViewItem::setOpen( open ); @@ -3512,7 +3512,7 @@ void ShoutcastBrowser::slotAnimation() s_iconCounter++; } -void ShoutcastBrowser::doneGenreDownload( KIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed ) +void ShoutcastBrowser::doneGenreDownload( TDEIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed ) { Q_UNUSED( job ); Q_UNUSED( from ); Q_UNUSED( directory ); Q_UNUSED( renamed ); @@ -3534,7 +3534,7 @@ void ShoutcastBrowser::doneGenreDownload( KIO::Job *job, const KURL &from, const file.close(); - KIO::del( to, false, false ); + TDEIO::del( to, false, false ); // We use this list to filter out some obscure genres TQStringList bannedGenres; @@ -3602,7 +3602,7 @@ void ShoutcastBrowser::doneGenreDownload( KIO::Job *job, const KURL &from, const setOpen( true ); } -void ShoutcastBrowser::jobFinished( KIO::Job *job ) +void ShoutcastBrowser::jobFinished( TDEIO::Job *job ) { m_downloading = false; m_animationTimer.stop(); @@ -3660,11 +3660,11 @@ void ShoutcastGenre::setOpen( bool open ) void ShoutcastGenre::startGenreDownload( TQString genre, TQString tmppath ) { TQString tmpfile = tmppath + "/amarok-list-" + genre + "-" + TDEApplication::randomString(10) + ".xml"; - KIO::CopyJob *cj = KIO::copy( "http://www.shoutcast.com/sbin/newxml.phtml?genre=" + genre, tmpfile, false ); - connect( cj, TQT_SIGNAL( copyingDone ( KIO::Job*, const KURL&, const KURL&, bool, bool ) ), - this, TQT_SLOT( doneListDownload( KIO::Job*, const KURL&, const KURL&, bool, bool ) ) ); - connect( cj, TQT_SIGNAL( result ( KIO::Job* ) ), - this, TQT_SLOT( jobFinished( KIO::Job* ) ) ); + TDEIO::CopyJob *cj = TDEIO::copy( "http://www.shoutcast.com/sbin/newxml.phtml?genre=" + genre, tmpfile, false ); + connect( cj, TQT_SIGNAL( copyingDone ( TDEIO::Job*, const KURL&, const KURL&, bool, bool ) ), + this, TQT_SLOT( doneListDownload( TDEIO::Job*, const KURL&, const KURL&, bool, bool ) ) ); + connect( cj, TQT_SIGNAL( result ( TDEIO::Job* ) ), + this, TQT_SLOT( jobFinished( TDEIO::Job* ) ) ); m_totalJobs++; } @@ -3678,7 +3678,7 @@ void ShoutcastGenre::slotAnimation() s_iconCounter++; } -void ShoutcastGenre::doneListDownload( KIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed ) +void ShoutcastGenre::doneListDownload( TDEIO::Job *job, const KURL &from, const KURL &to, bool directory, bool renamed ) { Q_UNUSED( job ); Q_UNUSED( from ); Q_UNUSED( directory ); Q_UNUSED( renamed ); @@ -3702,7 +3702,7 @@ void ShoutcastGenre::doneListDownload( KIO::Job *job, const KURL &from, const KU file.close(); - KIO::del(to, false, false); + TDEIO::del(to, false, false); //Go through the XML file and add all the stations TQDomElement docElem = doc.documentElement(); @@ -3733,7 +3733,7 @@ void ShoutcastGenre::doneListDownload( KIO::Job *job, const KURL &from, const KU } } -void ShoutcastGenre::jobFinished( KIO::Job *job ) +void ShoutcastGenre::jobFinished( TDEIO::Job *job ) { m_downloading = false; m_animationTimer.stop(); |