summaryrefslogtreecommitdiffstats
path: root/src/rip
diff options
context:
space:
mode:
Diffstat (limited to 'src/rip')
-rw-r--r--src/rip/k3baudiocdview.cpp12
-rw-r--r--src/rip/k3baudioconvertingoptionwidget.cpp12
-rw-r--r--src/rip/k3baudioconvertingoptionwidget.h8
-rw-r--r--src/rip/k3baudioprojectconvertingdialog.cpp10
-rw-r--r--src/rip/k3baudioprojectconvertingdialog.h4
-rw-r--r--src/rip/k3baudiorippingdialog.cpp10
-rw-r--r--src/rip/k3baudiorippingdialog.h4
-rw-r--r--src/rip/k3bcddbpatternwidget.cpp4
-rw-r--r--src/rip/k3bcddbpatternwidget.h6
-rw-r--r--src/rip/k3bvideocdrip.cpp2
-rw-r--r--src/rip/k3bvideocdrippingdialog.cpp10
-rw-r--r--src/rip/k3bvideocdrippingdialog.h4
-rw-r--r--src/rip/k3bvideocdview.cpp6
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingdialog.cpp12
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingdialog.h4
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingwidget.cpp6
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingwidget.h4
17 files changed, 59 insertions, 59 deletions
diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp
index 8fa47c2..66b4820 100644
--- a/src/rip/k3baudiocdview.cpp
+++ b/src/rip/k3baudiocdview.cpp
@@ -69,7 +69,7 @@ public:
setText( 1, TQString::number(_trackNumber).rightJustify( 2, ' ' ) );
setText( 3, i18n("Track %1").arg(_trackNumber) );
setText( 4, " " + length.toString() + " " );
- setText( 5, " " + KIO::convertSize( length.audioBytes() ) + " " );
+ setText( 5, " " + TDEIO::convertSize( length.audioBytes() ) + " " );
trackNumber = _trackNumber;
@@ -203,7 +203,7 @@ void K3bAudioCdView::reloadMedium()
updateDisplay();
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup("Cddb");
bool useCddb = ( c->readBoolEntry( "use local cddb query", true ) ||
c->readBoolEntry( "use remote cddb", false ) );
@@ -432,7 +432,7 @@ void K3bAudioCdView::slotEditAlbumCddb()
void K3bAudioCdView::queryCddb()
{
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup("Cddb");
m_cddb->readConfig( c );
@@ -453,7 +453,7 @@ void K3bAudioCdView::slotCddbQueryFinished( int error )
m_cddbInfo = m_cddb->result();
// save the entry locally
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup( "Cddb" );
if( c->readBoolEntry( "save cddb entries locally", true ) )
m_cddb->saveEntry( m_cddbInfo );
@@ -461,7 +461,7 @@ void K3bAudioCdView::slotCddbQueryFinished( int error )
updateDisplay();
}
else if( error == K3bCddbQuery::NO_ENTRY_FOUND ) {
- if( !KConfigGroup( k3bcore->config(), "Cddb" ).readBoolEntry( "use remote cddb", false ) )
+ if( !TDEConfigGroup( k3bcore->config(), "Cddb" ).readBoolEntry( "use remote cddb", false ) )
K3bPassivePopup::showPopup( i18n("<p>No CDDB entry found. Enable remote CDDB queries in the K3b settings to get access "
"to more entries through the internet."), i18n("CDDB") );
else
@@ -509,7 +509,7 @@ void K3bAudioCdView::slotSaveCddbLocally()
// make sure the data gets updated (bad design like a lot in the cddb stuff! :(
m_cddbInfo.rawData.truncate(0);
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup("Cddb");
m_cddb->readConfig( c );
diff --git a/src/rip/k3baudioconvertingoptionwidget.cpp b/src/rip/k3baudioconvertingoptionwidget.cpp
index f777ef7..15fa9fd 100644
--- a/src/rip/k3baudioconvertingoptionwidget.cpp
+++ b/src/rip/k3baudioconvertingoptionwidget.cpp
@@ -44,7 +44,7 @@ public:
TQTimer freeSpaceUpdateTimer;
- KIO::filesize_t neededSize;
+ TDEIO::filesize_t neededSize;
int getDefaultFormat() {
// we prefere formats in this order:
@@ -145,11 +145,11 @@ void K3bAudioConvertingOptionWidget::setBaseDir( const TQString& path )
}
-void K3bAudioConvertingOptionWidget::setNeededSize( KIO::filesize_t size )
+void K3bAudioConvertingOptionWidget::setNeededSize( TDEIO::filesize_t size )
{
d->neededSize = size;
if( size > 0 )
- m_labelNeededSpace->setText( KIO::convertSize( size ) );
+ m_labelNeededSpace->setText( TDEIO::convertSize( size ) );
else
m_labelNeededSpace->setText( i18n("unknown") );
@@ -175,7 +175,7 @@ void K3bAudioConvertingOptionWidget::slotUpdateFreeTempSpace()
unsigned long size, avail;
if( K3b::kbFreeOnFs( path, size, avail ) ) {
- m_labelFreeSpace->setText( KIO::convertSizeFromKB(avail) );
+ m_labelFreeSpace->setText( TDEIO::convertSizeFromKB(avail) );
if( avail < d->neededSize/1024 )
m_labelNeededSpace->setPaletteForegroundColor( TQt::red );
else
@@ -220,7 +220,7 @@ void K3bAudioConvertingOptionWidget::loadDefaults()
}
-void K3bAudioConvertingOptionWidget::loadConfig( KConfigBase* c )
+void K3bAudioConvertingOptionWidget::loadConfig( TDEConfigBase* c )
{
m_editBaseDir->setURL( c->readPathEntry( "last ripping directory", TQDir::homeDirPath() ) );
@@ -247,7 +247,7 @@ void K3bAudioConvertingOptionWidget::loadConfig( KConfigBase* c )
}
-void K3bAudioConvertingOptionWidget::saveConfig( KConfigBase* c )
+void K3bAudioConvertingOptionWidget::saveConfig( TDEConfigBase* c )
{
c->writePathEntry( "last ripping directory", m_editBaseDir->url() );
diff --git a/src/rip/k3baudioconvertingoptionwidget.h b/src/rip/k3baudioconvertingoptionwidget.h
index a9bbefa..9352e3f 100644
--- a/src/rip/k3baudioconvertingoptionwidget.h
+++ b/src/rip/k3baudioconvertingoptionwidget.h
@@ -22,7 +22,7 @@
#include <kio/global.h>
class K3bAudioEncoder;
-class KConfigBase;
+class TDEConfigBase;
/**
@@ -39,7 +39,7 @@ class K3bAudioConvertingOptionWidget : public base_K3bAudioRippingOptionWidget
void setBaseDir( const TQString& path );
- void setNeededSize( KIO::filesize_t );
+ void setNeededSize( TDEIO::filesize_t );
/**
* @returns 0 if wave is selected
@@ -56,8 +56,8 @@ class K3bAudioConvertingOptionWidget : public base_K3bAudioRippingOptionWidget
public slots:
void loadDefaults();
- void loadConfig( KConfigBase* );
- void saveConfig( KConfigBase* );
+ void loadConfig( TDEConfigBase* );
+ void saveConfig( TDEConfigBase* );
signals:
void changed();
diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp
index fbb0800..03c7db3 100644
--- a/src/rip/k3baudioprojectconvertingdialog.cpp
+++ b/src/rip/k3baudioprojectconvertingdialog.cpp
@@ -220,7 +220,7 @@ void K3bAudioProjectConvertingDialog::refresh()
TQString extension = m_optionWidget->extension();
- KIO::filesize_t overallSize = 0;
+ TDEIO::filesize_t overallSize = 0;
if( m_optionWidget->createSingleFile() ) {
TQString filename;
@@ -245,7 +245,7 @@ void K3bAudioProjectConvertingDialog::refresh()
m_viewTracks->lastItem(),
filename + "." + extension,
m_doc->length().toString(),
- filesize < 0 ? i18n("unknown") : KIO::convertSize( filesize ) );
+ filesize < 0 ? i18n("unknown") : TDEIO::convertSize( filesize ) );
d->filenames.append( K3b::fixupPath( baseDir + "/" + filename + "." + extension ) );
@@ -283,7 +283,7 @@ void K3bAudioProjectConvertingDialog::refresh()
m_viewTracks->lastItem(),
filename,
track->length().toString(),
- filesize < 0 ? i18n("unknown") : KIO::convertSize( filesize ) );
+ filesize < 0 ? i18n("unknown") : TDEIO::convertSize( filesize ) );
d->filenames.append( K3b::fixupPath( baseDir + "/" + filename ) );
@@ -330,7 +330,7 @@ void K3bAudioProjectConvertingDialog::loadK3bDefaults()
refresh();
}
-void K3bAudioProjectConvertingDialog::loadUserDefaults( KConfigBase* c )
+void K3bAudioProjectConvertingDialog::loadUserDefaults( TDEConfigBase* c )
{
m_optionWidget->loadConfig( c );
m_patternWidget->loadConfig( c );
@@ -339,7 +339,7 @@ void K3bAudioProjectConvertingDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bAudioProjectConvertingDialog::saveUserDefaults( KConfigBase* c )
+void K3bAudioProjectConvertingDialog::saveUserDefaults( TDEConfigBase* c )
{
m_optionWidget->saveConfig( c );
m_patternWidget->saveConfig( c );
diff --git a/src/rip/k3baudioprojectconvertingdialog.h b/src/rip/k3baudioprojectconvertingdialog.h
index e443aeb..e04e5ca 100644
--- a/src/rip/k3baudioprojectconvertingdialog.h
+++ b/src/rip/k3baudioprojectconvertingdialog.h
@@ -55,8 +55,8 @@ class K3bAudioProjectConvertingDialog : public K3bInteractionDialog
protected:
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
private:
K3bCddbPatternWidget* m_patternWidget;
diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp
index 4e681b2..4298532 100644
--- a/src/rip/k3baudiorippingdialog.cpp
+++ b/src/rip/k3baudiorippingdialog.cpp
@@ -292,7 +292,7 @@ void K3bAudioRippingDialog::refresh()
TQString baseDir = K3b::prepareDir( m_optionWidget->baseDir() );
d->fsInfo.setPath( baseDir );
- KIO::filesize_t overallSize = 0;
+ TDEIO::filesize_t overallSize = 0;
if( m_optionWidget->createSingleFile() ) {
long length = 0;
@@ -334,7 +334,7 @@ void K3bAudioRippingDialog::refresh()
m_viewTracks->lastItem(),
filename + "." + extension,
K3b::Msf(length).toString(),
- fileSize < 0 ? i18n("unknown") : KIO::convertSize( fileSize ),
+ fileSize < 0 ? i18n("unknown") : TDEIO::convertSize( fileSize ),
i18n("Audio") );
d->filenames.append( baseDir + "/" + filename + "." + extension );
@@ -392,7 +392,7 @@ void K3bAudioRippingDialog::refresh()
m_viewTracks->lastItem(),
filename,
trackLength.toString(),
- fileSize < 0 ? i18n("unknown") : KIO::convertSize( fileSize ),
+ fileSize < 0 ? i18n("unknown") : TDEIO::convertSize( fileSize ),
(m_toc[index].type() == K3bTrack::AUDIO ? i18n("Audio") : i18n("Data") ) );
d->filenames.append( baseDir + "/" + filename );
@@ -442,7 +442,7 @@ void K3bAudioRippingDialog::loadK3bDefaults()
refresh();
}
-void K3bAudioRippingDialog::loadUserDefaults( KConfigBase* c )
+void K3bAudioRippingDialog::loadUserDefaults( TDEConfigBase* c )
{
m_comboParanoiaMode->setCurrentItem( c->readNumEntry( "paranoia_mode", 0 ) );
m_spinRetries->setValue( c->readNumEntry( "read_retries", 5 ) );
@@ -455,7 +455,7 @@ void K3bAudioRippingDialog::loadUserDefaults( KConfigBase* c )
refresh();
}
-void K3bAudioRippingDialog::saveUserDefaults( KConfigBase* c )
+void K3bAudioRippingDialog::saveUserDefaults( TDEConfigBase* c )
{
c->writeEntry( "paranoia_mode", m_comboParanoiaMode->currentText().toInt() );
c->writeEntry( "read_retries", m_spinRetries->value() );
diff --git a/src/rip/k3baudiorippingdialog.h b/src/rip/k3baudiorippingdialog.h
index 2cb58ed..f660efe 100644
--- a/src/rip/k3baudiorippingdialog.h
+++ b/src/rip/k3baudiorippingdialog.h
@@ -80,8 +80,8 @@ class K3bAudioRippingDialog : public K3bInteractionDialog
void setupContextHelp();
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
class Private;
Private* d;
diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp
index cd0c3f1..ae1191f 100644
--- a/src/rip/k3bcddbpatternwidget.cpp
+++ b/src/rip/k3bcddbpatternwidget.cpp
@@ -100,7 +100,7 @@ bool K3bCddbPatternWidget::replaceBlanks() const
}
-void K3bCddbPatternWidget::loadConfig( KConfigBase* c )
+void K3bCddbPatternWidget::loadConfig( TDEConfigBase* c )
{
m_comboPlaylistPattern->setEditText( c->readEntry( "playlist pattern", m_comboPlaylistPattern->text(0) ) );
m_comboFilenamePattern->setEditText( c->readEntry( "filename pattern", m_comboFilenamePattern->text(0) ) );
@@ -109,7 +109,7 @@ void K3bCddbPatternWidget::loadConfig( KConfigBase* c )
}
-void K3bCddbPatternWidget::saveConfig( KConfigBase* c )
+void K3bCddbPatternWidget::saveConfig( TDEConfigBase* c )
{
c->writeEntry( "playlist pattern", m_comboPlaylistPattern->currentText() );
c->writeEntry( "filename pattern", m_comboFilenamePattern->currentText() );
diff --git a/src/rip/k3bcddbpatternwidget.h b/src/rip/k3bcddbpatternwidget.h
index 77e8f26..5c8dca5 100644
--- a/src/rip/k3bcddbpatternwidget.h
+++ b/src/rip/k3bcddbpatternwidget.h
@@ -19,7 +19,7 @@
#include "base_k3bcddbpatternwidget.h"
-class KConfigBase;
+class TDEConfigBase;
class K3bCddbPatternWidget : public base_K3bCddbPatternWidget
@@ -40,8 +40,8 @@ class K3bCddbPatternWidget : public base_K3bCddbPatternWidget
void changed();
public slots:
- void loadConfig( KConfigBase* );
- void saveConfig( KConfigBase* );
+ void loadConfig( TDEConfigBase* );
+ void saveConfig( TDEConfigBase* );
void loadDefaults();
private slots:
diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp
index 7df8305..b987e96 100644
--- a/src/rip/k3bvideocdrip.cpp
+++ b/src/rip/k3bvideocdrip.cpp
@@ -349,7 +349,7 @@ TQString K3bVideoCdRip::jobDescription() const
TQString K3bVideoCdRip::jobDetails() const
{
- return TQString( "(%1)" ).arg ( KIO::convertSize( m_videooptions ->getVideoCdSize() ) );
+ return TQString( "(%1)" ).arg ( TDEIO::convertSize( m_videooptions ->getVideoCdSize() ) );
}
#include "k3bvideocdrip.moc"
diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp
index 855de41..eeec3d5 100644
--- a/src/rip/k3bvideocdrippingdialog.cpp
+++ b/src/rip/k3bvideocdrippingdialog.cpp
@@ -126,7 +126,7 @@ void K3bVideoCdRippingDialog::setupGui()
connect( m_editDirectory, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateFreeSpace()) );
- m_labelNecessarySize ->setText( KIO::convertSize( m_videooptions ->getVideoCdSize() ) );
+ m_labelNecessarySize ->setText( TDEIO::convertSize( m_videooptions ->getVideoCdSize() ) );
}
@@ -170,7 +170,7 @@ void K3bVideoCdRippingDialog::slotStartClicked()
TQFileInfo* fi;
while ( ( fi = it.current() ) != 0 ) {
if ( fi ->fileName() != "." && fi ->fileName() != ".." )
- filesExists.append( TQString( "%1 (%2)" ).arg( TQFile::encodeName( fi ->fileName() ).data() ).arg( KIO::convertSize( fi ->size() ) ) );
+ filesExists.append( TQString( "%1 (%2)" ).arg( TQFile::encodeName( fi ->fileName() ).data() ).arg( TDEIO::convertSize( fi ->size() ) ) );
++it;
}
@@ -202,7 +202,7 @@ void K3bVideoCdRippingDialog::slotFreeSpace(const TQString&,
unsigned long,
unsigned long kbAvail)
{
- m_labelFreeSpace->setText( KIO::convertSizeFromKB(kbAvail) );
+ m_labelFreeSpace->setText( TDEIO::convertSizeFromKB(kbAvail) );
m_freeSpace = kbAvail;
@@ -239,7 +239,7 @@ void K3bVideoCdRippingDialog::loadK3bDefaults()
slotUpdateFreeSpace();
}
-void K3bVideoCdRippingDialog::loadUserDefaults( KConfigBase* c )
+void K3bVideoCdRippingDialog::loadUserDefaults( TDEConfigBase* c )
{
m_editDirectory ->setURL( c->readPathEntry( "last ripping directory", TQDir::homeDirPath() ) );
m_ignoreExt ->setChecked( c->readBoolEntry( "ignore ext", false ) );
@@ -249,7 +249,7 @@ void K3bVideoCdRippingDialog::loadUserDefaults( KConfigBase* c )
slotUpdateFreeSpace();
}
-void K3bVideoCdRippingDialog::saveUserDefaults( KConfigBase* c )
+void K3bVideoCdRippingDialog::saveUserDefaults( TDEConfigBase* c )
{
c->writePathEntry( "last ripping directory", m_editDirectory->url() );
c->writeEntry( "ignore ext", m_ignoreExt ->isChecked( ) );
diff --git a/src/rip/k3bvideocdrippingdialog.h b/src/rip/k3bvideocdrippingdialog.h
index 11240f9..1d2aafd 100644
--- a/src/rip/k3bvideocdrippingdialog.h
+++ b/src/rip/k3bvideocdrippingdialog.h
@@ -46,8 +46,8 @@ class K3bVideoCdRippingDialog : public K3bInteractionDialog
void setupContextHelp();
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
K3bTempDirSelectionWidget* m_tempDirSelectionWidget;
diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp
index 62fc364..1924d23 100644
--- a/src/rip/k3bvideocdview.cpp
+++ b/src/rip/k3bvideocdview.cpp
@@ -72,7 +72,7 @@ class K3bVideoCdView::VideoTrackViewItem : public TQListViewItem
setText( 1, name );
if ( length > 0 ) {
setText( 2, length.toString() );
- setText( 3, KIO::convertSize( length.mode2Form2Bytes() ) );
+ setText( 3, TDEIO::convertSize( length.mode2Form2Bytes() ) );
}
trackNumber = _trackNumber;
@@ -129,9 +129,9 @@ class K3bVideoCdView::VideoTrackViewCheckItem : public TQCheckListItem
{
setText( 2, length.toString() );
if ( form2 )
- setText( 3, KIO::convertSize( length.mode2Form2Bytes() ) );
+ setText( 3, TDEIO::convertSize( length.mode2Form2Bytes() ) );
else
- setText( 3, KIO::convertSize( length.mode2Form1Bytes() ) );
+ setText( 3, TDEIO::convertSize( length.mode2Form1Bytes() ) );
}
};
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index 3ba01b4..4aa571e 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -272,7 +272,7 @@ void K3bVideoDVDRippingDialog::slotUpdateFilenames()
void K3bVideoDVDRippingDialog::slotUpdateFilesizes()
{
double bitrate = (double)m_w->m_spinVideoBitrate->value();
- KIO::filesize_t overallSize = 0ULL;
+ TDEIO::filesize_t overallSize = 0ULL;
// update file sizes
for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin();
@@ -281,13 +281,13 @@ void K3bVideoDVDRippingDialog::slotUpdateFilesizes()
double sec = m_dvd[it.data().title-1].playbackTime().totalSeconds();
// estimate the filesize
- KIO::filesize_t size = (KIO::filesize_t)( sec * bitrate * 1000.0 / 8.0 );
+ TDEIO::filesize_t size = (TDEIO::filesize_t)( sec * bitrate * 1000.0 / 8.0 );
// add audio stream size
// FIXME: consider AC3 passthrough
- size += (KIO::filesize_t)( sec * m_w->selectedAudioBitrate() / 8.0 * 1024.0 );
+ size += (TDEIO::filesize_t)( sec * m_w->selectedAudioBitrate() / 8.0 * 1024.0 );
- it.key()->setText( 2, KIO::convertSize( size ) );
+ it.key()->setText( 2, TDEIO::convertSize( size ) );
overallSize += size;
}
@@ -514,7 +514,7 @@ void K3bVideoDVDRippingDialog::loadK3bDefaults()
}
-void K3bVideoDVDRippingDialog::loadUserDefaults( KConfigBase* c )
+void K3bVideoDVDRippingDialog::loadUserDefaults( TDEConfigBase* c )
{
m_w->m_spinVideoBitrate->setValue( c->readNumEntry( "video bitrate", 1200 ) );
m_w->m_checkTwoPassEncoding->setChecked( c->readBoolEntry( "two pass encoding", true ) );
@@ -532,7 +532,7 @@ void K3bVideoDVDRippingDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bVideoDVDRippingDialog::saveUserDefaults( KConfigBase* c )
+void K3bVideoDVDRippingDialog::saveUserDefaults( TDEConfigBase* c )
{
c->writeEntry( "video bitrate", m_w->m_spinVideoBitrate->value() );
c->writeEntry( "two pass encoding", m_w->m_checkTwoPassEncoding->isChecked() );
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.h b/src/rip/videodvd/k3bvideodvdrippingdialog.h
index 7f5408a..7180a2b 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.h
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.h
@@ -66,8 +66,8 @@ class K3bVideoDVDRippingDialog : public K3bInteractionDialog
TQString createFilename( const K3bVideoDVDRippingJob::TitleRipInfo& info, const TQString& pattern ) const;
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
K3bVideoDVDRippingWidget* m_w;
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
index 41489f7..51b74a2 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
@@ -253,7 +253,7 @@ void K3bVideoDVDRippingWidget::slotUpdateFreeTempSpace()
unsigned long size, avail;
if( K3b::kbFreeOnFs( path, size, avail ) ) {
- m_labelFreeSpace->setText( KIO::convertSizeFromKB(avail) );
+ m_labelFreeSpace->setText( TDEIO::convertSizeFromKB(avail) );
if( avail < m_neededSize/1024 )
m_labelNeededSpace->setPaletteForegroundColor( TQt::red );
else
@@ -266,11 +266,11 @@ void K3bVideoDVDRippingWidget::slotUpdateFreeTempSpace()
}
-void K3bVideoDVDRippingWidget::setNeededSize( KIO::filesize_t size )
+void K3bVideoDVDRippingWidget::setNeededSize( TDEIO::filesize_t size )
{
m_neededSize = size;
if( size > 0 )
- m_labelNeededSpace->setText( KIO::convertSize( size ) );
+ m_labelNeededSpace->setText( TDEIO::convertSize( size ) );
else
m_labelNeededSpace->setText( i18n("unknown") );
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.h b/src/rip/videodvd/k3bvideodvdrippingwidget.h
index 032ecb1..1642bbc 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.h
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.h
@@ -46,7 +46,7 @@ class K3bVideoDVDRippingWidget : public base_K3bVideoDVDRippingWidget
void setSelectedAudioBitrate( int bitrate );
void setSelectedPictureSize( const TQSize& );
- void setNeededSize( KIO::filesize_t );
+ void setNeededSize( TDEIO::filesize_t );
signals:
void changed();
@@ -60,7 +60,7 @@ class K3bVideoDVDRippingWidget : public base_K3bVideoDVDRippingWidget
private:
TQTimer* m_freeSpaceUpdateTimer;
- KIO::filesize_t m_neededSize;
+ TDEIO::filesize_t m_neededSize;
TQSize m_customVideoSize;
};