From 3c5631f74d1c75204f950140331e10f739082ee9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:33:36 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kuickshow/src/kuickfile.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'kuickshow/src/kuickfile.cpp') diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp index a48c27db..d0cff155 100644 --- a/kuickshow/src/kuickfile.cpp +++ b/kuickshow/src/kuickfile.cpp @@ -22,7 +22,7 @@ KuickFile::KuickFile(const KURL& url) if ( m_url.isLocalFile()) m_localFile = m_url.path(); else { - const KURL& mostLocal = KIO::NetAccess::mostLocalURL( m_url, 0L ); + const KURL& mostLocal = TDEIO::NetAccess::mostLocalURL( m_url, 0L ); if ( mostLocal.isValid() && mostLocal.isLocalFile() ) m_localFile = mostLocal.path(); } @@ -84,10 +84,10 @@ bool KuickFile::download() KURL destURL; destURL.setPath( tempFile.name() ); - m_job = KIO::file_copy( m_url, destURL, -1, true, false, false ); // handling progress ourselves + m_job = TDEIO::file_copy( m_url, destURL, -1, true, false, false ); // handling progress ourselves m_job->setAutoErrorHandlingEnabled( true ); - connect( m_job, TQT_SIGNAL( result( KIO::Job * )), TQT_SLOT( slotResult( KIO::Job * ) )); - connect( m_job, TQT_SIGNAL( percent( KIO::Job *, unsigned long )), TQT_SLOT( slotProgress( KIO::Job *, unsigned long ) )); + connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )), TQT_SLOT( slotResult( TDEIO::Job * ) )); + connect( m_job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long )), TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) )); // TODO: generify background/foreground downloading? @@ -136,7 +136,7 @@ KuickFile::DownloadStatus KuickFile::waitForDownload( TQWidget *parent ) return OK; } -void KuickFile::slotResult( KIO::Job *job ) +void KuickFile::slotResult( TDEIO::Job *job ) { if (job != m_job) { // huh? return; @@ -147,15 +147,15 @@ void KuickFile::slotResult( KIO::Job *job ) if ( job->error() != 0 ) { m_currentProgress = 0; - if ( job->error() != KIO::ERR_USER_CANCELED ) + if ( job->error() != TDEIO::ERR_USER_CANCELED ) kdWarning() << "ERROR: KuickFile::slotResult: " << job->errorString() << endl; - TQString canceledFile = static_cast(job)->destURL().path(); + TQString canceledFile = static_cast(job)->destURL().path(); TQFile::remove( canceledFile ); m_progress->topLevelWidget()->hide(); } else { - m_localFile = static_cast(job)->destURL().path(); + m_localFile = static_cast(job)->destURL().path(); emit downloaded( this ); // before closing the progress dialog if ( m_progress ) { @@ -168,7 +168,7 @@ void KuickFile::slotResult( KIO::Job *job ) } } -void KuickFile::slotProgress( KIO::Job *job, unsigned long percent ) +void KuickFile::slotProgress( TDEIO::Job *job, unsigned long percent ) { if (job != m_job) { // huh? return; -- cgit v1.2.1