diff options
Diffstat (limited to 'src/projects')
37 files changed, 97 insertions, 97 deletions
diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp index 4f1a40b..5c5634a 100644 --- a/src/projects/k3baudioburndialog.cpp +++ b/src/projects/k3baudioburndialog.cpp @@ -194,7 +194,7 @@ void K3bAudioBurnDialog::loadK3bDefaults() } -void K3bAudioBurnDialog::loadUserDefaults( KConfigBase* c ) +void K3bAudioBurnDialog::loadUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::loadUserDefaults( c ); @@ -210,7 +210,7 @@ void K3bAudioBurnDialog::loadUserDefaults( KConfigBase* c ) } -void K3bAudioBurnDialog::saveUserDefaults( KConfigBase* c ) +void K3bAudioBurnDialog::saveUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::saveUserDefaults( c ); diff --git a/src/projects/k3baudioburndialog.h b/src/projects/k3baudioburndialog.h index df59be5..c564efe 100644 --- a/src/projects/k3baudioburndialog.h +++ b/src/projects/k3baudioburndialog.h @@ -52,8 +52,8 @@ class K3bAudioBurnDialog : public K3bProjectBurnDialog void saveSettings(); void readSettings(); void loadK3bDefaults(); - void loadUserDefaults( KConfigBase* ); - void saveUserDefaults( KConfigBase* ); + void loadUserDefaults( TDEConfigBase* ); + void saveUserDefaults( TDEConfigBase* ); void showEvent( TQShowEvent* ); void toggleAll(); diff --git a/src/projects/k3baudiotrackdialog.cpp b/src/projects/k3baudiotrackdialog.cpp index bdfb9f0..14f3726 100644 --- a/src/projects/k3baudiotrackdialog.cpp +++ b/src/projects/k3baudiotrackdialog.cpp @@ -105,7 +105,7 @@ void K3bAudioTrackDialog::updateTrackLengthDisplay() { // K3b::Msf len = m_editTrackEnd->msfValue() - m_editTrackStart->msfValue(); // m_displayLength->setText( len.toString() ); -// m_displaySize->setText( KIO::convertSize(len.audioBytes()) ); +// m_displaySize->setText( TDEIO::convertSize(len.audioBytes()) ); } diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp index cf2f086..52c32e2 100644 --- a/src/projects/k3bbootimageview.cpp +++ b/src/projects/k3bbootimageview.cpp @@ -128,7 +128,7 @@ void K3bBootImageView::slotNewBootImage() { TQString file = KFileDialog::getOpenFileName( TQString(), TQString(), this, i18n("Please Choose Boot Image") ); if( !file.isEmpty() ) { - KIO::filesize_t fsize = K3b::filesize( file ); + TDEIO::filesize_t fsize = K3b::filesize( file ); int boottype = K3bBootItem::FLOPPY; if( fsize != 1200*1024 && fsize != 1440*1024 && @@ -218,7 +218,7 @@ void K3bBootImageView::loadBootItemSettings( K3bBootItem* item ) m_radioNoEmulation->setChecked(true); // force floppy size - KIO::filesize_t fsize = K3b::filesize( item->localPath() ); + TDEIO::filesize_t fsize = K3b::filesize( item->localPath() ); m_radioFloppy->setDisabled( fsize != 1200*1024 && fsize != 1440*1024 && fsize != 2880*1024 ); diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp index 38260e3..eee70f0 100644 --- a/src/projects/k3bdataburndialog.cpp +++ b/src/projects/k3bdataburndialog.cpp @@ -69,7 +69,7 @@ K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *parent, const c { prepareGui(); - setTitle( i18n("Data Project"), i18n("Size: %1").arg( KIO::convertSize(_doc->size()) ) ); + setTitle( i18n("Data Project"), i18n("Size: %1").arg( TDEIO::convertSize(_doc->size()) ) ); // for now we just put the verify checkbox on the main page... m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); @@ -220,7 +220,7 @@ void K3bDataBurnDialog::loadK3bDefaults() } -void K3bDataBurnDialog::loadUserDefaults( KConfigBase* c ) +void K3bDataBurnDialog::loadUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::loadUserDefaults(c); @@ -236,7 +236,7 @@ void K3bDataBurnDialog::loadUserDefaults( KConfigBase* c ) } -void K3bDataBurnDialog::saveUserDefaults( KConfigBase* c ) +void K3bDataBurnDialog::saveUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::saveUserDefaults(c); diff --git a/src/projects/k3bdataburndialog.h b/src/projects/k3bdataburndialog.h index de73862..749b783 100644 --- a/src/projects/k3bdataburndialog.h +++ b/src/projects/k3bdataburndialog.h @@ -51,8 +51,8 @@ class K3bDataBurnDialog : public K3bProjectBurnDialog protected: void setupSettingsTab(); void loadK3bDefaults(); - void loadUserDefaults( KConfigBase* ); - void saveUserDefaults( KConfigBase* ); + void loadUserDefaults( TDEConfigBase* ); + void saveUserDefaults( TDEConfigBase* ); void toggleAll(); // --- settings tab --------------------------- diff --git a/src/projects/k3bdatamultisessioncombobox.cpp b/src/projects/k3bdatamultisessioncombobox.cpp index 98736b1..5566ead 100644 --- a/src/projects/k3bdatamultisessioncombobox.cpp +++ b/src/projects/k3bdatamultisessioncombobox.cpp @@ -99,7 +99,7 @@ K3bDataDoc::MultiSessionMode K3bDataMultiSessionCombobox::multiSessionMode() con } -void K3bDataMultiSessionCombobox::saveConfig( KConfigBase* c ) +void K3bDataMultiSessionCombobox::saveConfig( TDEConfigBase* c ) { TQString s; switch( currentItem() ) { @@ -124,7 +124,7 @@ void K3bDataMultiSessionCombobox::saveConfig( KConfigBase* c ) } -void K3bDataMultiSessionCombobox::loadConfig( KConfigBase* c ) +void K3bDataMultiSessionCombobox::loadConfig( TDEConfigBase* c ) { TQString s = c->readEntry( "multisession mode" ); if( s == "none" ) diff --git a/src/projects/k3bdatamultisessioncombobox.h b/src/projects/k3bdatamultisessioncombobox.h index 64465e3..704f61c 100644 --- a/src/projects/k3bdatamultisessioncombobox.h +++ b/src/projects/k3bdatamultisessioncombobox.h @@ -19,7 +19,7 @@ #include <tqcombobox.h> #include <k3bdatadoc.h> -class KConfigBase; +class TDEConfigBase; class K3bDataMultiSessionCombobox : public TQComboBox @@ -38,8 +38,8 @@ class K3bDataMultiSessionCombobox : public TQComboBox void setForceNoMultisession( bool ); - void saveConfig( KConfigBase* ); - void loadConfig( KConfigBase* ); + void saveConfig( TDEConfigBase* ); + void loadConfig( TDEConfigBase* ); public slots: void setMultiSessionMode( K3bDataDoc::MultiSessionMode ); diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp index 67c6602..d6d5075 100644 --- a/src/projects/k3bdatapropertiesdialog.cpp +++ b/src/projects/k3bdatapropertiesdialog.cpp @@ -101,7 +101,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge TQString localLocation = kFileItem.url().path(-1); localLocation.truncate( localLocation.findRev('/') ); m_labelLocalLocation->setText( localLocation ); - m_labelSize->setText( KIO::convertSize(dataItem->size()) ); + m_labelSize->setText( TDEIO::convertSize(dataItem->size()) ); } else if( K3bDirItem* dirItem = dynamic_cast<K3bDirItem*>(dataItem) ) { labelMimeType->setPixmap( KMimeType::pixmapForURL( KURL( "/" )) ); @@ -111,7 +111,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge m_labelLocalName->hide(); m_labelLocalLocation->hide(); line->hide(); - m_labelSize->setText( KIO::convertSize(dataItem->size()) + "\n(" + + m_labelSize->setText( TDEIO::convertSize(dataItem->size()) + "\n(" + i18n("in 1 file", "in %n files", dirItem->numFiles()) + " " + i18n("and 1 directory", "and %n directories", dirItem->numDirs()) + ")" ); } @@ -123,7 +123,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge label1->hide(); label2->hide(); line->hide(); - m_labelSize->setText( KIO::convertSize(dataItem->size()) ); + m_labelSize->setText( TDEIO::convertSize(dataItem->size()) ); } m_editName->setText( dataItem->k3bName() ); diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp index a471308..842520e 100644 --- a/src/projects/k3bdataurladdingdialog.cpp +++ b/src/projects/k3bdataurladdingdialog.cpp @@ -181,7 +181,7 @@ TQString K3bDataUrlAddingDialog::resultMessage() const .arg( m_unreadableFiles.join( "<br>" ) ); if( !m_tooBigFiles.isEmpty() ) message += TQString("<p><b>%1:</b><br>%2") - .arg( i18n("It is not possible to add files bigger than %1").arg(KIO::convertSize(0xFFFFFFFF)) ) + .arg( i18n("It is not possible to add files bigger than %1").arg(TDEIO::convertSize(0xFFFFFFFF)) ) .arg( m_tooBigFiles.join( "<br>" ) ); if( !m_mkisofsLimitationRenamedFiles.isEmpty() ) message += TQString("<p><b>%1:</b><br>%2") diff --git a/src/projects/k3bdataurladdingdialog.h b/src/projects/k3bdataurladdingdialog.h index a5207c7..4a6b081 100644 --- a/src/projects/k3bdataurladdingdialog.h +++ b/src/projects/k3bdataurladdingdialog.h @@ -101,8 +101,8 @@ class K3bDataUrlAddingDialog : public KDialogBase bool m_copyItems; - KIO::filesize_t m_totalFiles; - KIO::filesize_t m_filesHandled; + TDEIO::filesize_t m_totalFiles; + TDEIO::filesize_t m_filesHandled; K3bDirSizeJob* m_dirSizeJob; unsigned int m_lastProgress; diff --git a/src/projects/k3bdataview.h b/src/projects/k3bdataview.h index bf09b1f..1291643 100644 --- a/src/projects/k3bdataview.h +++ b/src/projects/k3bdataview.h @@ -28,7 +28,7 @@ class K3bDataFileView; class TQLineEdit; -namespace KIO { +namespace TDEIO { class Job; } namespace K3bDevice { diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp index 414fe6d..7cfe576 100644 --- a/src/projects/k3bdataviewitem.cpp +++ b/src/projects/k3bdataviewitem.cpp @@ -169,7 +169,7 @@ TQString K3bDataDirViewItem::text( int index ) const case 1: return i18n("Directory"); case 2: - return KIO::convertSize( m_dirItem->size() ); + return TDEIO::convertSize( m_dirItem->size() ); default: return ""; } @@ -233,7 +233,7 @@ TQString K3bDataFileViewItem::text( int index ) const return comment; } case 2: - return KIO::convertSize( m_fileItem->size() ); + return TDEIO::convertSize( m_fileItem->size() ); case 3: return m_fileItem->localPath(); case 4: { @@ -311,7 +311,7 @@ TQString K3bSpecialDataViewItem::text( int col ) const case 1: return ((K3bSpecialDataItem*)dataItem())->mimeType(); case 2: - return KIO::convertSize( dataItem()->size() ); + return TDEIO::convertSize( dataItem()->size() ); default: return ""; } @@ -333,7 +333,7 @@ TQString K3bSessionImportViewItem::text( int col ) const case 1: return i18n("From previous session"); case 2: - return KIO::convertSize( dataItem()->size() ); + return TDEIO::convertSize( dataItem()->size() ); default: return ""; } diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp index 7f04ed4..a393360 100644 --- a/src/projects/k3bdvdburndialog.cpp +++ b/src/projects/k3bdvdburndialog.cpp @@ -50,7 +50,7 @@ K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, TQWidget *parent, const char { prepareGui(); - setTitle( i18n("DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) ); + setTitle( i18n("DVD Project"), i18n("Size: %1").arg( TDEIO::convertSize(doc->size()) ) ); // for now we just put the verify checkbox on the main page... m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); @@ -244,7 +244,7 @@ void K3bDvdBurnDialog::loadK3bDefaults() } -void K3bDvdBurnDialog::loadUserDefaults( KConfigBase* c ) +void K3bDvdBurnDialog::loadUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::loadUserDefaults(c); @@ -259,7 +259,7 @@ void K3bDvdBurnDialog::loadUserDefaults( KConfigBase* c ) } -void K3bDvdBurnDialog::saveUserDefaults( KConfigBase* c ) +void K3bDvdBurnDialog::saveUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::saveUserDefaults(c); diff --git a/src/projects/k3bdvdburndialog.h b/src/projects/k3bdvdburndialog.h index b49fef8..69387b3 100644 --- a/src/projects/k3bdvdburndialog.h +++ b/src/projects/k3bdvdburndialog.h @@ -47,8 +47,8 @@ class K3bDvdBurnDialog : public K3bProjectBurnDialog protected: void slotStartClicked(); void loadK3bDefaults(); - void loadUserDefaults( KConfigBase* ); - void saveUserDefaults( KConfigBase* ); + void loadUserDefaults( TDEConfigBase* ); + void saveUserDefaults( TDEConfigBase* ); void toggleAll(); private: diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp index 15534b5..555348b 100644 --- a/src/projects/k3bfillstatusdisplay.cpp +++ b/src/projects/k3bfillstatusdisplay.cpp @@ -194,22 +194,22 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* ) if( d->showTime ) docSizeText = d->doc->length().toString(false) + " " + i18n("min"); else - docSizeText = KIO::convertSize( d->doc->size() ); + docSizeText = TDEIO::convertSize( d->doc->size() ); TQString overSizeText; if( d->cdSize.mode1Bytes() >= d->doc->size() ) overSizeText = i18n("Available: %1 of %2") .arg( d->showTime ? i18n("%1 min").arg((K3b::Msf( cdSize*60*75 ) - d->doc->length()).toString(false)) - : KIO::convertSize( TQMAX( (cdSize * 1024LL * 1024LL) - (long long)d->doc->size(), 0LL ) ) ) + : TDEIO::convertSize( TQMAX( (cdSize * 1024LL * 1024LL) - (long long)d->doc->size(), 0LL ) ) ) .arg( d->showTime ? i18n("%1 min").arg(K3b::Msf( cdSize*60*75 ).toString(false)) - : KIO::convertSizeFromKB( cdSize * 1024 ) ); + : TDEIO::convertSizeFromKB( cdSize * 1024 ) ); else overSizeText = i18n("Capacity exceeded by %1") .arg( d->showTime ? i18n("%1 min").arg( (d->doc->length() - K3b::Msf( cdSize*60*75 ) ).toString(false)) - : KIO::convertSize( (long long)d->doc->size() - (cdSize * 1024LL * 1024LL) ) ); + : TDEIO::convertSize( (long long)d->doc->size() - (cdSize * 1024LL * 1024LL) ) ); // ==================================================================================== // draw the medium size marker @@ -286,7 +286,7 @@ public: void maybeTip( const TQPoint& ) { tip( parentWidget()->rect(), - KIO::convertSize( m_doc->size() ) + + TDEIO::convertSize( m_doc->size() ) + " (" + TDEGlobal::locale()->formatNumber( m_doc->size(), 0 ) + "), " + m_doc->length().toString(false) + " " + i18n("min") + " (" + i18n("Right click for media sizes") + ")"); @@ -394,9 +394,9 @@ void K3bFillStatusDisplay::setupPopupMenu() d->actionCollection, "fillstatus_80minutes" ); d->action100Min = new KRadioAction( i18n("%1 MB").arg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()), d->actionCollection, "fillstatus_100minutes" ); - d->actionDvd4_7GB = new KRadioAction( KIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()), + d->actionDvd4_7GB = new KRadioAction( TDEIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()), d->actionCollection, "fillstatus_dvd_4_7gb" ); - d->actionDvdDoubleLayer = new KRadioAction( KIO::convertSizeFromKB((int)(8.0*1024.0*1024.0)), + d->actionDvdDoubleLayer = new KRadioAction( TDEIO::convertSizeFromKB((int)(8.0*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdDoubleLayer()), d->actionCollection, "fillstatus_dvd_double_layer" ); d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCustomSize()), @@ -618,7 +618,7 @@ void K3bFillStatusDisplay::slotDetermineSize() void K3bFillStatusDisplay::slotLoadUserDefaults() { // load project specific values - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "default " + d->doc->typeString() + " settings" ); // defaults to megabytes @@ -725,7 +725,7 @@ void K3bFillStatusDisplay::slotMediumChanged( K3bDevice::Device* ) void K3bFillStatusDisplay::slotSaveUserDefaults() { // save project specific values - KConfig* c = k3bcore->config(); + TDEConfig* c = k3bcore->config(); c->setGroup( "default " + d->doc->typeString() + " settings" ); c->writeEntry( "show minutes", d->showTime ); diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp index 1446f1f..7d74a2f 100644 --- a/src/projects/k3bmixedburndialog.cpp +++ b/src/projects/k3bmixedburndialog.cpp @@ -214,7 +214,7 @@ void K3bMixedBurnDialog::loadK3bDefaults() } -void K3bMixedBurnDialog::loadUserDefaults( KConfigBase* c ) +void K3bMixedBurnDialog::loadUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::loadUserDefaults( c ); @@ -238,7 +238,7 @@ void K3bMixedBurnDialog::loadUserDefaults( KConfigBase* c ) } -void K3bMixedBurnDialog::saveUserDefaults( KConfigBase* c ) +void K3bMixedBurnDialog::saveUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::saveUserDefaults(c); diff --git a/src/projects/k3bmixedburndialog.h b/src/projects/k3bmixedburndialog.h index 0d1a132..fc9a229 100644 --- a/src/projects/k3bmixedburndialog.h +++ b/src/projects/k3bmixedburndialog.h @@ -44,8 +44,8 @@ class K3bMixedBurnDialog : public K3bProjectBurnDialog protected: void loadK3bDefaults(); - void loadUserDefaults( KConfigBase* ); - void saveUserDefaults( KConfigBase* ); + void loadUserDefaults( TDEConfigBase* ); + void saveUserDefaults( TDEConfigBase* ); void toggleAll(); K3bDataImageSettingsWidget* m_imageSettingsWidget; diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp index 1864745..c09f930 100644 --- a/src/projects/k3bmovixburndialog.cpp +++ b/src/projects/k3bmovixburndialog.cpp @@ -52,7 +52,7 @@ K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* parent, cons m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); setTitle( i18n("eMovix CD Project"), - i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) ); + i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(TDEIO::convertSize(m_doc->size())) ); m_movixOptionsWidget = new K3bMovixOptionsWidget( this ); addPage( m_movixOptionsWidget, i18n("eMovix") ); @@ -127,7 +127,7 @@ void K3bMovixBurnDialog::loadK3bDefaults() } -void K3bMovixBurnDialog::loadUserDefaults( KConfigBase* c ) +void K3bMovixBurnDialog::loadUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::loadUserDefaults(c); @@ -146,7 +146,7 @@ void K3bMovixBurnDialog::loadUserDefaults( KConfigBase* c ) } -void K3bMovixBurnDialog::saveUserDefaults( KConfigBase* c ) +void K3bMovixBurnDialog::saveUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::saveUserDefaults(c); diff --git a/src/projects/k3bmovixburndialog.h b/src/projects/k3bmovixburndialog.h index 9462603..1be5d69 100644 --- a/src/projects/k3bmovixburndialog.h +++ b/src/projects/k3bmovixburndialog.h @@ -43,8 +43,8 @@ class K3bMovixBurnDialog : public K3bProjectBurnDialog void saveSettings(); void readSettings(); void loadK3bDefaults(); - void loadUserDefaults( KConfigBase* ); - void saveUserDefaults( KConfigBase* ); + void loadUserDefaults( TDEConfigBase* ); + void saveUserDefaults( TDEConfigBase* ); void toggleAll(); private: diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp index 24e3904..83d560b 100644 --- a/src/projects/k3bmovixdvdburndialog.cpp +++ b/src/projects/k3bmovixdvdburndialog.cpp @@ -54,7 +54,7 @@ K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* par m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE ); setTitle( i18n("eMovix DVD Project"), - i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) ); + i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(TDEIO::convertSize(m_doc->size())) ); m_movixOptionsWidget = new K3bMovixOptionsWidget( this ); addPage( m_movixOptionsWidget, i18n("eMovix") ); @@ -103,7 +103,7 @@ void K3bMovixDvdBurnDialog::loadK3bDefaults() } -void K3bMovixDvdBurnDialog::loadUserDefaults( KConfigBase* c ) +void K3bMovixDvdBurnDialog::loadUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::loadUserDefaults(c); @@ -118,7 +118,7 @@ void K3bMovixDvdBurnDialog::loadUserDefaults( KConfigBase* c ) } -void K3bMovixDvdBurnDialog::saveUserDefaults( KConfigBase* c ) +void K3bMovixDvdBurnDialog::saveUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::saveUserDefaults(c); diff --git a/src/projects/k3bmovixdvdburndialog.h b/src/projects/k3bmovixdvdburndialog.h index 2acf389..7210389 100644 --- a/src/projects/k3bmovixdvdburndialog.h +++ b/src/projects/k3bmovixdvdburndialog.h @@ -42,8 +42,8 @@ class K3bMovixDvdBurnDialog : public K3bProjectBurnDialog void saveSettings(); void readSettings(); void loadK3bDefaults(); - void loadUserDefaults( KConfigBase* ); - void saveUserDefaults( KConfigBase* ); + void loadUserDefaults( TDEConfigBase* ); + void saveUserDefaults( TDEConfigBase* ); void toggleAll(); private: diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp index 44136b5..b3b7fb2 100644 --- a/src/projects/k3bmovixlistview.cpp +++ b/src/projects/k3bmovixlistview.cpp @@ -89,7 +89,7 @@ TQString K3bMovixFileViewItem::text( int col ) const return const_cast<K3bMovixFileViewItem*>(this)->mimeComment() + " "; } case 3: - return KIO::convertSize( fileItem()->size() ) + " "; + return TDEIO::convertSize( fileItem()->size() ) + " "; case 4: return fileItem()->localPath() + " "; case 5: @@ -144,7 +144,7 @@ TQString K3bMovixSubTitleViewItem::text( int c ) const return const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment(); } case 3: - return KIO::convertSize( fileItem()->subTitleItem()->size() ); + return TDEIO::convertSize( fileItem()->subTitleItem()->size() ); case 4: return fileItem()->subTitleItem()->localPath(); case 5: diff --git a/src/projects/k3bmovixoptionswidget.cpp b/src/projects/k3bmovixoptionswidget.cpp index 094de6e..0a2432d 100644 --- a/src/projects/k3bmovixoptionswidget.cpp +++ b/src/projects/k3bmovixoptionswidget.cpp @@ -163,7 +163,7 @@ void K3bMovixOptionsWidget::loadDefaults() } -void K3bMovixOptionsWidget::loadConfig( KConfigBase* c ) +void K3bMovixOptionsWidget::loadConfig( TDEConfigBase* c ) { TQString s = c->readEntry("subtitle_fontset"); if( !s.isEmpty() && s != "none" && m_comboSubtitleFontset->contains(s) ) @@ -201,7 +201,7 @@ void K3bMovixOptionsWidget::loadConfig( KConfigBase* c ) } -void K3bMovixOptionsWidget::saveConfig( KConfigBase* c ) +void K3bMovixOptionsWidget::saveConfig( TDEConfigBase* c ) { if( m_comboSubtitleFontset->currentItem() == 0 ) c->writeEntry( "subtitle_fontset", "none" ); diff --git a/src/projects/k3bmovixoptionswidget.h b/src/projects/k3bmovixoptionswidget.h index c646996..d589622 100644 --- a/src/projects/k3bmovixoptionswidget.h +++ b/src/projects/k3bmovixoptionswidget.h @@ -21,7 +21,7 @@ class K3bMovixDoc; class K3bMovixBin; -class KConfigBase; +class TDEConfigBase; class K3bMovixOptionsWidget : public base_K3bMovixOptionsWidget @@ -37,8 +37,8 @@ class K3bMovixOptionsWidget : public base_K3bMovixOptionsWidget void init( const K3bMovixBin* ); void readSettings( K3bMovixDoc* ); void saveSettings( K3bMovixDoc* ); - void loadConfig( KConfigBase* c ); - void saveConfig( KConfigBase* c ); + void loadConfig( TDEConfigBase* c ); + void saveConfig( TDEConfigBase* c ); void loadDefaults(); private: diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp index d486f23..04e829b 100644 --- a/src/projects/k3bprojectburndialog.cpp +++ b/src/projects/k3bprojectburndialog.cpp @@ -366,7 +366,7 @@ void K3bProjectBurnDialog::readSettings() } -void K3bProjectBurnDialog::saveUserDefaults( KConfigBase* c ) +void K3bProjectBurnDialog::saveUserDefaults( TDEConfigBase* c ) { m_writingModeWidget->saveConfig( c ); c->writeEntry( "simulate", m_checkSimulate->isChecked() ); @@ -380,7 +380,7 @@ void K3bProjectBurnDialog::saveUserDefaults( KConfigBase* c ) } -void K3bProjectBurnDialog::loadUserDefaults( KConfigBase* c ) +void K3bProjectBurnDialog::loadUserDefaults( TDEConfigBase* c ) { m_writingModeWidget->loadConfig( c ); m_checkSimulate->setChecked( c->readBoolEntry( "simulate", false ) ); diff --git a/src/projects/k3bprojectburndialog.h b/src/projects/k3bprojectburndialog.h index 086e16c..1dcaca3 100644 --- a/src/projects/k3bprojectburndialog.h +++ b/src/projects/k3bprojectburndialog.h @@ -30,7 +30,7 @@ class TQTabWidget; class TQSpinBox; class TQVBoxLayout; class K3bWritingModeWidget; -class KConfigBase; +class TDEConfigBase; /** @@ -95,7 +95,7 @@ class K3bProjectBurnDialog : public K3bInteractionDialog virtual void loadK3bDefaults(); /** - * The default implementation loads the following settings from the KConfig. + * The default implementation loads the following settings from the TDEConfig. * May be used in subclasses. * <ul> * <li>Writing mode</li> @@ -107,10 +107,10 @@ class K3bProjectBurnDialog : public K3bInteractionDialog * <li>writing speed</li> * </ul> */ - virtual void loadUserDefaults( KConfigBase* ); + virtual void loadUserDefaults( TDEConfigBase* ); /** - * The default implementation saves the following settings to the KConfig. + * The default implementation saves the following settings to the TDEConfig. * May be used in subclasses. * <ul> * <li>Writing mode</li> @@ -122,7 +122,7 @@ class K3bProjectBurnDialog : public K3bInteractionDialog * <li>writing speed</li> * </ul> */ - virtual void saveUserDefaults( KConfigBase* ); + virtual void saveUserDefaults( TDEConfigBase* ); /** * The default implementation saves the following settings to the doc and may be called diff --git a/src/projects/k3bprojectplugindialog.cpp b/src/projects/k3bprojectplugindialog.cpp index 6b59c68..de15960 100644 --- a/src/projects/k3bprojectplugindialog.cpp +++ b/src/projects/k3bprojectplugindialog.cpp @@ -48,13 +48,13 @@ void K3bProjectPluginDialog::slotStartClicked() } -void K3bProjectPluginDialog::saveUserDefaults( KConfigBase* config ) +void K3bProjectPluginDialog::saveUserDefaults( TDEConfigBase* config ) { m_pluginGui->saveSettings( config ); } -void K3bProjectPluginDialog::loadUserDefaults( KConfigBase* config ) +void K3bProjectPluginDialog::loadUserDefaults( TDEConfigBase* config ) { m_pluginGui->readSettings( config ); } diff --git a/src/projects/k3bprojectplugindialog.h b/src/projects/k3bprojectplugindialog.h index af698d0..cd87e10 100644 --- a/src/projects/k3bprojectplugindialog.h +++ b/src/projects/k3bprojectplugindialog.h @@ -21,7 +21,7 @@ class K3bProjectPlugin; class K3bProjectPluginGUIBase; class K3bDoc; -class KConfigBase; +class TDEConfigBase; class K3bProjectPluginDialog : public K3bInteractionDialog @@ -35,8 +35,8 @@ class K3bProjectPluginDialog : public K3bInteractionDialog protected slots: void slotStartClicked(); - void saveUserDefaults( KConfigBase* config ); - void loadUserDefaults( KConfigBase* config ); + void saveUserDefaults( TDEConfigBase* config ); + void loadUserDefaults( TDEConfigBase* config ); void loadK3bDefaults(); private: diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp index 1d6d8a9..0a36668 100644 --- a/src/projects/k3bvcdburndialog.cpp +++ b/src/projects/k3bvcdburndialog.cpp @@ -69,7 +69,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha } setTitle( vcdType, i18n( "1 MPEG (%1)", "%n MPEGs (%1)", - m_vcdDoc->tracks() ->count() ).arg( KIO::convertSize( m_vcdDoc->size() ) ) ); + m_vcdDoc->tracks() ->count() ).arg( TDEIO::convertSize( m_vcdDoc->size() ) ) ); const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager() ->binObject( "cdrecord" ); if ( cdrecordBin && cdrecordBin->hasFeature( "cuefile" ) ) @@ -793,7 +793,7 @@ void K3bVcdBurnDialog::readSettings() loadCdiConfig(); } -void K3bVcdBurnDialog::loadUserDefaults( KConfigBase* c ) +void K3bVcdBurnDialog::loadUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::loadUserDefaults( c ); @@ -845,7 +845,7 @@ void K3bVcdBurnDialog::loadUserDefaults( KConfigBase* c ) } -void K3bVcdBurnDialog::saveUserDefaults( KConfigBase* c ) +void K3bVcdBurnDialog::saveUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::saveUserDefaults( c ); diff --git a/src/projects/k3bvcdburndialog.h b/src/projects/k3bvcdburndialog.h index cbba2ec..c43ac19 100644 --- a/src/projects/k3bvcdburndialog.h +++ b/src/projects/k3bvcdburndialog.h @@ -55,8 +55,8 @@ class K3bVcdBurnDialog : public K3bProjectBurnDialog void readSettings(); void loadK3bDefaults(); - void loadUserDefaults( KConfigBase* ); - void saveUserDefaults( KConfigBase* ); + void loadUserDefaults( TDEConfigBase* ); + void saveUserDefaults( TDEConfigBase* ); // ----------------------------------------------------------- // the video-cd-tab diff --git a/src/projects/k3bvcdlistviewitem.cpp b/src/projects/k3bvcdlistviewitem.cpp index 9ad778f..b18ec30 100644 --- a/src/projects/k3bvcdlistviewitem.cpp +++ b/src/projects/k3bvcdlistviewitem.cpp @@ -72,7 +72,7 @@ TQString K3bVcdListViewItem::text( int i ) const return m_track->duration() + " "; case 8: // track size - return KIO::convertSize( m_track->size() ) + " "; + return TDEIO::convertSize( m_track->size() ) + " "; case 9: // filename return m_track->fileName(); diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index ff25b55..99eeb6c 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -69,7 +69,7 @@ K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, TQPtrList<K3bVcdTrack>& t m_displayFileName->setText( selectedTrack->fileName() ); m_displayLength->setText( selectedTrack->duration() ); - m_displaySize->setText( KIO::convertSize( selectedTrack->size() ) ); + m_displaySize->setText( TDEIO::convertSize( selectedTrack->size() ) ); m_muxrate->setText( i18n( "%1 bit/s" ).arg( selectedTrack->muxrate() ) ); if ( selectedTrack->isSegment() ) diff --git a/src/projects/k3bvideodvdburndialog.cpp b/src/projects/k3bvideodvdburndialog.cpp index 32bdefa..8a02e2b 100644 --- a/src/projects/k3bvideodvdburndialog.cpp +++ b/src/projects/k3bvideodvdburndialog.cpp @@ -46,7 +46,7 @@ K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, TQWidget *par { prepareGui(); - setTitle( i18n("Video DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) ); + setTitle( i18n("Video DVD Project"), i18n("Size: %1").arg( TDEIO::convertSize(doc->size()) ) ); // for now we just put the verify checkbox on the main page... m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup ); @@ -146,7 +146,7 @@ void K3bVideoDvdBurnDialog::loadK3bDefaults() } -void K3bVideoDvdBurnDialog::loadUserDefaults( KConfigBase* c ) +void K3bVideoDvdBurnDialog::loadUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::loadUserDefaults( c ); @@ -159,7 +159,7 @@ void K3bVideoDvdBurnDialog::loadUserDefaults( KConfigBase* c ) } -void K3bVideoDvdBurnDialog::saveUserDefaults( KConfigBase* c ) +void K3bVideoDvdBurnDialog::saveUserDefaults( TDEConfigBase* c ) { K3bProjectBurnDialog::saveUserDefaults(c); diff --git a/src/projects/k3bvideodvdburndialog.h b/src/projects/k3bvideodvdburndialog.h index af2d33c..185c84b 100644 --- a/src/projects/k3bvideodvdburndialog.h +++ b/src/projects/k3bvideodvdburndialog.h @@ -41,8 +41,8 @@ class K3bVideoDvdBurnDialog : public K3bProjectBurnDialog protected: void loadK3bDefaults(); - void loadUserDefaults( KConfigBase* ); - void saveUserDefaults( KConfigBase* ); + void loadUserDefaults( TDEConfigBase* ); + void saveUserDefaults( TDEConfigBase* ); void toggleAll(); private: diff --git a/src/projects/kostore/koStore.cc b/src/projects/kostore/koStore.cc index 08268dc..4f645e0 100644 --- a/src/projects/kostore/koStore.cc +++ b/src/projects/kostore/koStore.cc @@ -132,7 +132,7 @@ KoStore* KoStore::createStore( TQWidget* window, const KURL& url, Mode mode, con else { const bool downloaded = - KIO::NetAccess::download( url, tmpFile, window ); + TDEIO::NetAccess::download( url, tmpFile, window ); if (!downloaded) { @@ -194,14 +194,14 @@ bool KoStore::open( const TQString & _name ) if ( m_bIsOpen ) { kdWarning(s_area) << "KoStore: File is already opened" << endl; - //return KIO::ERR_INTERNAL; + //return TDEIO::ERR_INTERNAL; return false; } if ( m_sName.length() > 512 ) { kdError(s_area) << "KoStore: Filename " << m_sName << " is too long" << endl; - //return KIO::ERR_MALFORMED_URL; + //return TDEIO::ERR_MALFORMED_URL; return false; } @@ -211,7 +211,7 @@ bool KoStore::open( const TQString & _name ) if ( m_strFiles.findIndex( m_sName ) != -1 ) // just check if it's there { kdWarning(s_area) << "KoStore: Duplicate filename " << m_sName << endl; - //return KIO::ERR_FILE_ALREADY_EXIST; + //return TDEIO::ERR_FILE_ALREADY_EXIST; return false; } @@ -228,7 +228,7 @@ bool KoStore::open( const TQString & _name ) return false; } else - //return KIO::ERR_UNSUPPORTED_ACTION; + //return TDEIO::ERR_UNSUPPORTED_ACTION; return false; m_bIsOpen = true; @@ -247,7 +247,7 @@ bool KoStore::close() if ( !m_bIsOpen ) { kdWarning(s_area) << "KoStore: You must open before closing" << endl; - //return KIO::ERR_INTERNAL; + //return TDEIO::ERR_INTERNAL; return false; } diff --git a/src/projects/kostore/koZipStore.cc b/src/projects/kostore/koZipStore.cc index 1f1a526..cd393eb 100644 --- a/src/projects/kostore/koZipStore.cc +++ b/src/projects/kostore/koZipStore.cc @@ -98,11 +98,11 @@ KoZipStore::~KoZipStore() // Now we have still some job to do for remote files. if ( m_fileMode == KoStoreBase::RemoteRead ) { - KIO::NetAccess::removeTempFile( m_localFileName ); + TDEIO::NetAccess::removeTempFile( m_localFileName ); } else if ( m_fileMode == KoStoreBase::RemoteWrite ) { - KIO::NetAccess::upload( m_localFileName, m_url, m_window ); + TDEIO::NetAccess::upload( m_localFileName, m_url, m_window ); // ### FIXME: delete temp file } } @@ -148,13 +148,13 @@ bool KoZipStore::openRead( const TQString& name ) if ( entry == 0L ) { //kdWarning(s_area) << "Unknown filename " << name << endl; - //return KIO::ERR_DOES_NOT_EXIST; + //return TDEIO::ERR_DOES_NOT_EXIST; return false; } if ( entry->isDirectory() ) { kdWarning(s_area) << name << " is a directory !" << endl; - //return KIO::ERR_IS_DIRECTORY; + //return TDEIO::ERR_IS_DIRECTORY; return false; } // Must cast to KZipFileEntry, not only KArchiveFile, because device() isn't virtual! |