diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:06:28 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:06:28 -0600 |
| commit | 83b79bb29aaa412caec6abcdb42ca21d248b3b3a (patch) | |
| tree | f48e8ae855d4a0be0c3ecf912a92168a829ff8c5 /libk3b/jobs | |
| parent | 2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (diff) | |
| download | k3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.tar.gz k3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libk3b/jobs')
| -rw-r--r-- | libk3b/jobs/k3bcdcopyjob.cpp | 8 | ||||
| -rw-r--r-- | libk3b/jobs/k3bdvdcopyjob.cpp | 2 | ||||
| -rw-r--r-- | libk3b/jobs/k3biso9660imagewritingjob.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp index 980bfeb..76bc7d3 100644 --- a/libk3b/jobs/k3bcdcopyjob.cpp +++ b/libk3b/jobs/k3bcdcopyjob.cpp @@ -302,7 +302,7 @@ void K3bCdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) // // check free temp space // - KIO::filesize_t imageSpaceNeeded = 0; + TDEIO::filesize_t imageSpaceNeeded = 0; for( K3bDevice::Toc::const_iterator it = d->toc.begin(); it != d->toc.end(); ++it ) { if( (*it).type() == K3bDevice::Track::AUDIO ) imageSpaceNeeded += (*it).length().audioBytes() + 44; @@ -415,7 +415,7 @@ void K3bCdCopyJob::queryCddb() this, TQT_SLOT(slotCddbQueryFinished(int)) ); } - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup("Cddb"); d->cddb->readConfig( c ); @@ -432,7 +432,7 @@ void K3bCdCopyJob::slotCddbQueryFinished( int error ) emit infoMessage( i18n("Found Cddb entry (%1 - %2).").arg(d->cddbInfo.cdArtist).arg(d->cddbInfo.cdTitle), SUCCESS ); // save the entry locally - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "Cddb" ); if( c->readBoolEntry( "save cddb entries locally", true ) ) d->cddb->saveEntry( d->cddbInfo ); @@ -1084,7 +1084,7 @@ void K3bCdCopyJob::cleanup() // remove the tempdir created in prepareImageFiles() if( d->deleteTempDir ) { - KIO::NetAccess::del( KURL::fromPathOrURL(m_tempPath), 0 ); + TDEIO::NetAccess::del( KURL::fromPathOrURL(m_tempPath), 0 ); d->deleteTempDir = false; } } diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp index d5382a3..6f36bf6 100644 --- a/libk3b/jobs/k3bdvdcopyjob.cpp +++ b/libk3b/jobs/k3bdvdcopyjob.cpp @@ -312,7 +312,7 @@ void K3bDvdCopyJob::slotDiskInfoReady( K3bDevice::DeviceHandler* dh ) // // check free temp space // - KIO::filesize_t imageSpaceNeeded = (KIO::filesize_t)(d->lastSector.lba()+1)*2048; + TDEIO::filesize_t imageSpaceNeeded = (TDEIO::filesize_t)(d->lastSector.lba()+1)*2048; unsigned long avail, size; TQString pathToTest = m_imagePath.left( m_imagePath.findRev( '/' ) ); if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) { diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp b/libk3b/jobs/k3biso9660imagewritingjob.cpp index 3a83553..e21e780 100644 --- a/libk3b/jobs/k3biso9660imagewritingjob.cpp +++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp @@ -451,7 +451,7 @@ TQString K3bIso9660ImageWritingJob::jobDescription() const TQString K3bIso9660ImageWritingJob::jobDetails() const { - return m_imagePath.section("/", -1) + TQString( " (%1)" ).arg(KIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath)))); + return m_imagePath.section("/", -1) + TQString( " (%1)" ).arg(TDEIO::convertSize(K3b::filesize(KURL::fromPathOrURL(m_imagePath)))); } |